Merge pull request #1779 from ceph/wip-7553

author Samuel Just <sam.just@inktank.com>

Mon, 12 May 2014 22:29:39 +0000 (15:29 -0700)

committer Samuel Just <sam.just@inktank.com>

Mon, 12 May 2014 22:29:39 +0000 (15:29 -0700)
author Samuel Just <sam.just@inktank.com>
Mon, 12 May 2014 22:29:39 +0000 (15:29 -0700)
committer Samuel Just <sam.just@inktank.com>
Mon, 12 May 2014 22:29:39 +0000 (15:29 -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
author	Samuel Just <sam.just@inktank.com>
	Mon, 12 May 2014 22:29:39 +0000 (15:29 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Mon, 12 May 2014 22:29:39 +0000 (15:29 -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