]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #22680 from VictorDenisov/backport_23772
authorYuri Weinstein <yweinste@redhat.com>
Fri, 3 Aug 2018 15:24:08 +0000 (08:24 -0700)
committerGitHub <noreply@github.com>
Fri, 3 Aug 2018 15:24:08 +0000 (08:24 -0700)
luminous: let "ceph status" use base 10 when printing numbers not sizes

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
1  2 
src/ceph_mon.cc
src/mon/OSDMonitor.cc
src/os/bluestore/BlueStore.cc
src/os/bluestore/NVMEDevice.cc
src/osd/OSD.cc
src/osd/OSDMap.cc
src/osd/osd_types.h
src/rgw/rgw_admin.cc

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