]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05755fe 02949bb)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.