]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #26764 into master
authorSage Weil <sage@redhat.com>
Thu, 7 Mar 2019 14:52:56 +0000 (08:52 -0600)
committerSage Weil <sage@redhat.com>
Thu, 7 Mar 2019 14:52:56 +0000 (08:52 -0600)
* refs/pull/26764/head:
mgr: 'osd df' by specified class or (crush) name
mon/OSDMonitor: add 'osd crush get-device-class' command

1  2 
qa/workunits/cephtool/test.sh
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/OSDMap.cc

Simple merge
Simple merge
Simple merge
Simple merge