]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3393 from ceph/wip-osd-df
authorSage Weil <sage@redhat.com>
Wed, 21 Jan 2015 21:52:53 +0000 (13:52 -0800)
committerSage Weil <sage@redhat.com>
Wed, 21 Jan 2015 21:52:53 +0000 (13:52 -0800)
osd: ceph osd df [tree] command

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/crush/CrushWrapper.cc
src/crush/CrushWrapper.h
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h
src/osd/OSDMap.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge