]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #14793 from dmick/wip-prio-and-daemonperf
authorSage Weil <sage@newdream.net>
Fri, 5 May 2017 22:41:55 +0000 (17:41 -0500)
committerGitHub <noreply@github.com>
Fri, 5 May 2017 22:41:55 +0000 (17:41 -0500)
ceph: perfcounter priorities and daemonperf updates to use them

1  2 
ceph.spec.in
debian/control
src/common/perf_counters.cc
src/common/perf_counters.h
src/os/bluestore/BlueFS.cc
src/os/bluestore/BlueStore.cc
src/osd/OSD.cc
src/osdc/Objecter.cc

diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Simple merge