]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #20152 from Rubab-Syed/add_units_to_performance_counters
authorJohn Spray <jspray@redhat.com>
Mon, 26 Feb 2018 11:24:43 +0000 (11:24 +0000)
committerGitHub <noreply@github.com>
Mon, 26 Feb 2018 11:24:43 +0000 (11:24 +0000)
mgr: add units to performance counters

Reviewed-by: John Spray <john.spray@redhat.com>
12 files changed:
1  2 
src/common/perf_counters.cc
src/common/perf_counters.h
src/librbd/ImageCtx.cc
src/mgr/ActivePyModules.cc
src/mon/Monitor.cc
src/os/bluestore/BlueFS.cc
src/os/bluestore/BlueStore.cc
src/osd/OSD.cc
src/osdc/ObjectCacher.cc
src/osdc/Objecter.cc
src/pybind/mgr/dashboard/module.py
src/pybind/mgr/mgr_module.py

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