Merge pull request #5248 from ceph/wip-11833-hammer

author Loic Dachary <loic@dachary.org>

Wed, 29 Jul 2015 14:22:36 +0000 (16:22 +0200)

committer Loic Dachary <loic@dachary.org>

Wed, 29 Jul 2015 14:22:36 +0000 (16:22 +0200)
author Loic Dachary <loic@dachary.org>
Wed, 29 Jul 2015 14:22:36 +0000 (16:22 +0200)
committer Loic Dachary <loic@dachary.org>
Wed, 29 Jul 2015 14:22:36 +0000 (16:22 +0200)
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	Loic Dachary <loic@dachary.org>
	Wed, 29 Jul 2015 14:22:36 +0000 (16:22 +0200)
committer	Loic Dachary <loic@dachary.org>
	Wed, 29 Jul 2015 14:22:36 +0000 (16:22 +0200)
		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