Merge pull request #3246 from ceph/wip-9780-9781

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

Thu, 22 Jan 2015 00:49:19 +0000 (16:49 -0800)

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

Thu, 22 Jan 2015 00:49:19 +0000 (16:49 -0800)
author Samuel Just <sam.just@inktank.com>
Thu, 22 Jan 2015 00:49:19 +0000 (16:49 -0800)
committer Samuel Just <sam.just@inktank.com>
Thu, 22 Jan 2015 00:49:19 +0000 (16:49 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Thu, 22 Jan 2015 00:49:19 +0000 (16:49 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 22 Jan 2015 00:49:19 +0000 (16:49 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history