Merge pull request #1872 from ceph/wip-reweight-tree

author Sage Weil <sage@inktank.com>

Mon, 9 Jun 2014 12:29:20 +0000 (05:29 -0700)

committer Sage Weil <sage@inktank.com>

Mon, 9 Jun 2014 12:29:20 +0000 (05:29 -0700)
author Sage Weil <sage@inktank.com>
Mon, 9 Jun 2014 12:29:20 +0000 (05:29 -0700)
committer Sage Weil <sage@inktank.com>
Mon, 9 Jun 2014 12:29:20 +0000 (05:29 -0700)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/crush/CrushWrapper.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Mon, 9 Jun 2014 12:29:20 +0000 (05:29 -0700)
committer	Sage Weil <sage@inktank.com>
	Mon, 9 Jun 2014 12:29:20 +0000 (05:29 -0700)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history