Merge pull request #2437 from athanatos/wip-9339

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

Tue, 9 Sep 2014 20:10:29 +0000 (13:10 -0700)

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

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