Merge pull request #1341 from ceph/wip-osd-status

author Sage Weil <sage@inktank.com>

Mon, 3 Mar 2014 19:21:11 +0000 (11:21 -0800)

committer Sage Weil <sage@inktank.com>

Mon, 3 Mar 2014 19:21:11 +0000 (11:21 -0800)
author Sage Weil <sage@inktank.com>
Mon, 3 Mar 2014 19:21:11 +0000 (11:21 -0800)
committer Sage Weil <sage@inktank.com>
Mon, 3 Mar 2014 19:21:11 +0000 (11:21 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Mon, 3 Mar 2014 19:21:11 +0000 (11:21 -0800)
committer	Sage Weil <sage@inktank.com>
	Mon, 3 Mar 2014 19:21:11 +0000 (11:21 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history