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

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

Thu, 30 Oct 2014 20:47:22 +0000 (13:47 -0700)

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

Thu, 30 Oct 2014 20:47:22 +0000 (13:47 -0700)
author Samuel Just <sam.just@inktank.com>
Thu, 30 Oct 2014 20:47:22 +0000 (13:47 -0700)
committer Samuel Just <sam.just@inktank.com>
Thu, 30 Oct 2014 20:47:22 +0000 (13:47 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Thu, 30 Oct 2014 20:47:22 +0000 (13:47 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 30 Oct 2014 20:47:22 +0000 (13:47 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history