Merge pull request #833 from ceph/wip-da-SCA-master

author Sage Weil <sage@inktank.com>

Fri, 8 Nov 2013 08:23:47 +0000 (00:23 -0800)

committer Sage Weil <sage@inktank.com>

Fri, 8 Nov 2013 08:23:47 +0000 (00:23 -0800)
author Sage Weil <sage@inktank.com>
Fri, 8 Nov 2013 08:23:47 +0000 (00:23 -0800)
committer Sage Weil <sage@inktank.com>
Fri, 8 Nov 2013 08:23:47 +0000 (00:23 -0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 8 Nov 2013 08:23:47 +0000 (00:23 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 8 Nov 2013 08:23:47 +0000 (00:23 -0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history