Merge pull request #931 from ceph/wip-5858-rebase

author athanatos <sam.just@inktank.com>

Mon, 13 Jan 2014 22:25:51 +0000 (14:25 -0800)

committer athanatos <sam.just@inktank.com>

Mon, 13 Jan 2014 22:25:51 +0000 (14:25 -0800)
author athanatos <sam.just@inktank.com>
Mon, 13 Jan 2014 22:25:51 +0000 (14:25 -0800)
committer athanatos <sam.just@inktank.com>
Mon, 13 Jan 2014 22:25:51 +0000 (14:25 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	athanatos <sam.just@inktank.com>
	Mon, 13 Jan 2014 22:25:51 +0000 (14:25 -0800)
committer	athanatos <sam.just@inktank.com>
	Mon, 13 Jan 2014 22:25:51 +0000 (14:25 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history