git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6633f8a b5e1bd1)

author	Sage Weil <sage@redhat.com>
	Wed, 21 Jan 2015 21:52:53 +0000 (13:52 -0800)
committer	Sage Weil <sage@redhat.com>
	Wed, 21 Jan 2015 21:52:53 +0000 (13:52 -0800)
commit	e203673c03a968feeba2f419ebcdfb9253b68a12
tree	c0386a421faefbcb114d5c03977ceb92883318e1	tree \| snapshot
parent	6633f8a3edc86d42af2ad9e28918a2a925f44c66	commit \| diff
parent	b5e1bd1fab4bd4aae768b72ab75f46df78758c04	commit \| diff

Merge pull request #3393 from ceph/wip-osd-df

osd: ceph osd df [tree] command

Reviewed-by: Sage Weil <sage@redhat.com>

src/crush/CrushWrapper.cc	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.h	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.