Merge pull request #1954 from dachary/wip-8307-erasure-code-profile-implicit-creation

author Sage Weil <sage@inktank.com>

Mon, 16 Jun 2014 16:35:05 +0000 (09:35 -0700)

committer Sage Weil <sage@inktank.com>

Mon, 16 Jun 2014 16:35:05 +0000 (09:35 -0700)
author Sage Weil <sage@inktank.com>
Mon, 16 Jun 2014 16:35:05 +0000 (09:35 -0700)
committer Sage Weil <sage@inktank.com>
Mon, 16 Jun 2014 16:35:05 +0000 (09:35 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Mon, 16 Jun 2014 16:35:05 +0000 (09:35 -0700)
committer	Sage Weil <sage@inktank.com>
	Mon, 16 Jun 2014 16:35:05 +0000 (09:35 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history