]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #14982 into master
authorSage Weil <sage@redhat.com>
Tue, 6 Nov 2018 13:25:16 +0000 (07:25 -0600)
committerSage Weil <sage@redhat.com>
Tue, 6 Nov 2018 13:25:16 +0000 (07:25 -0600)
commited77be665f28a7fb2335523c9c3f4f3c9588e3b1
treedace2ee936691bb47f7a8659cd715bdd1b3f2907
parent05755fea768f9e73a7b8fcadb452d7e651a36e4e
parent02949bb37d714a65183e89810e731713933d055c
Merge PR #14982 into master

* refs/pull/14982/head:
common/mempool: tolerate sum < 0
common/ceph_context: add perf counters for all mempools
common/ceph_common: add heartbeat perf counters unconditionally

Reviewed-by: Josh Durgin <jdurgin@redhat.com>