Merge pull request #2716 from ceph/wip-firefly-9419

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

Fri, 17 Oct 2014 17:47:22 +0000 (10:47 -0700)

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

Fri, 17 Oct 2014 17:47:22 +0000 (10:47 -0700)
author Samuel Just <sam.just@inktank.com>
Fri, 17 Oct 2014 17:47:22 +0000 (10:47 -0700)
committer Samuel Just <sam.just@inktank.com>
Fri, 17 Oct 2014 17:47:22 +0000 (10:47 -0700)
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>
	Fri, 17 Oct 2014 17:47:22 +0000 (10:47 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Fri, 17 Oct 2014 17:47:22 +0000 (10:47 -0700)
		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