Merge pull request #888 from ceph/wip-crush-tunables

author Sage Weil <sage@inktank.com>

Fri, 6 Dec 2013 22:45:57 +0000 (14:45 -0800)

committer Sage Weil <sage@inktank.com>

Fri, 6 Dec 2013 22:45:57 +0000 (14:45 -0800)
author Sage Weil <sage@inktank.com>
Fri, 6 Dec 2013 22:45:57 +0000 (14:45 -0800)
committer Sage Weil <sage@inktank.com>
Fri, 6 Dec 2013 22:45:57 +0000 (14:45 -0800)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/crush/CrushWrapper.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 6 Dec 2013 22:45:57 +0000 (14:45 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 6 Dec 2013 22:45:57 +0000 (14:45 -0800)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.h	patch \|	diff1 \|	diff2 \|	blob \| history