]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #23266 from rhcs-dashboard/wip-25117-luminous
authorYuri Weinstein <yweinste@redhat.com>
Fri, 17 Aug 2018 19:46:16 +0000 (12:46 -0700)
committerGitHub <noreply@github.com>
Fri, 17 Aug 2018 19:46:16 +0000 (12:46 -0700)
luminous: mgr: add units to performance counters

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
1  2 
src/mgr/ActivePyModules.cc
src/mgr/MgrClient.cc
src/os/bluestore/BlueFS.cc
src/os/bluestore/BlueStore.cc
src/osd/OSD.cc
src/osdc/ObjectCacher.cc
src/pybind/mgr/dashboard/module.py
src/pybind/mgr/mgr_module.py

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Simple merge
Simple merge
Simple merge