Merge pull request #2141 from ceph/wip-8882

author Sage Weil <sage@inktank.com>

Fri, 25 Jul 2014 17:34:33 +0000 (10:34 -0700)

committer Sage Weil <sage@inktank.com>

Fri, 25 Jul 2014 17:34:33 +0000 (10:34 -0700)
author Sage Weil <sage@inktank.com>
Fri, 25 Jul 2014 17:34:33 +0000 (10:34 -0700)
committer Sage Weil <sage@inktank.com>
Fri, 25 Jul 2014 17:34:33 +0000 (10:34 -0700)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 25 Jul 2014 17:34:33 +0000 (10:34 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 25 Jul 2014 17:34:33 +0000 (10:34 -0700)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history