Merge remote branch 'gh/wip-osd-recovery-sources'

author Sage Weil <sage.weil@dreamhost.com>

Fri, 30 Mar 2012 21:57:57 +0000 (14:57 -0700)

committer Sage Weil <sage.weil@dreamhost.com>

Fri, 30 Mar 2012 21:57:57 +0000 (14:57 -0700)
author Sage Weil <sage.weil@dreamhost.com>
Fri, 30 Mar 2012 21:57:57 +0000 (14:57 -0700)
committer Sage Weil <sage.weil@dreamhost.com>
Fri, 30 Mar 2012 21:57:57 +0000 (14:57 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Sage Weil <sage.weil@dreamhost.com>
	Fri, 30 Mar 2012 21:57:57 +0000 (14:57 -0700)
committer	Sage Weil <sage.weil@dreamhost.com>
	Fri, 30 Mar 2012 21:57:57 +0000 (14:57 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history