Merge pull request #4712 from dachary/wip-11663-verify-erasure-code-profile

author Loic Dachary <loic@dachary.org>

Wed, 3 Jun 2015 08:47:50 +0000 (10:47 +0200)

committer Loic Dachary <loic@dachary.org>

Wed, 3 Jun 2015 08:47:50 +0000 (10:47 +0200)
author Loic Dachary <loic@dachary.org>
Wed, 3 Jun 2015 08:47:50 +0000 (10:47 +0200)
committer Loic Dachary <loic@dachary.org>
Wed, 3 Jun 2015 08:47:50 +0000 (10:47 +0200)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/test/mon/osd-crush.sh
Simple merge
author	Loic Dachary <loic@dachary.org>
	Wed, 3 Jun 2015 08:47:50 +0000 (10:47 +0200)
committer	Loic Dachary <loic@dachary.org>
	Wed, 3 Jun 2015 08:47:50 +0000 (10:47 +0200)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/mon/osd-crush.sh	patch \|	diff1 \|	diff2 \|	blob \| history