Merge remote-tracking branch 'gh/wip-crush-forcefeed'

author Sage Weil <sage@newdream.net>

Fri, 4 May 2012 21:16:49 +0000 (14:16 -0700)

committer Sage Weil <sage@newdream.net>

Fri, 4 May 2012 21:16:49 +0000 (14:16 -0700)
author Sage Weil <sage@newdream.net>
Fri, 4 May 2012 21:16:49 +0000 (14:16 -0700)
committer Sage Weil <sage@newdream.net>
Fri, 4 May 2012 21:16:49 +0000 (14:16 -0700)
diff --cc src/crush/CrushWrapper.h
Simple merge
diff --cc src/crushtool.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 4 May 2012 21:16:49 +0000 (14:16 -0700)
committer	Sage Weil <sage@newdream.net>
	Fri, 4 May 2012 21:16:49 +0000 (14:16 -0700)
		1	2
src/crush/CrushWrapper.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/crushtool.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history