Merge pull request #2891 from XinzeChi/master

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

Thu, 20 Nov 2014 17:44:09 +0000 (09:44 -0800)

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

Thu, 20 Nov 2014 17:44:09 +0000 (09:44 -0800)
author Samuel Just <sam.just@inktank.com>
Thu, 20 Nov 2014 17:44:09 +0000 (09:44 -0800)
committer Samuel Just <sam.just@inktank.com>
Thu, 20 Nov 2014 17:44:09 +0000 (09:44 -0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Thu, 20 Nov 2014 17:44:09 +0000 (09:44 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 20 Nov 2014 17:44:09 +0000 (09:44 -0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history