Merge remote-tracking branch 'origin/wip-sam-firefly-backports' into firefly

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

Thu, 6 Nov 2014 18:37:42 +0000 (10:37 -0800)

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

Thu, 6 Nov 2014 18:37:42 +0000 (10:37 -0800)
author Samuel Just <sam.just@inktank.com>
Thu, 6 Nov 2014 18:37:42 +0000 (10:37 -0800)
committer Samuel Just <sam.just@inktank.com>
Thu, 6 Nov 2014 18:37:42 +0000 (10:37 -0800)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Thu, 6 Nov 2014 18:37:42 +0000 (10:37 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 6 Nov 2014 18:37:42 +0000 (10:37 -0800)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history