Merge pull request #5585 from tchaikov/wip-4941

author Kefu Chai <tchaikov@gmail.com>

Wed, 26 Aug 2015 16:15:12 +0000 (00:15 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Wed, 26 Aug 2015 16:15:12 +0000 (00:15 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 26 Aug 2015 16:15:12 +0000 (00:15 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Wed, 26 Aug 2015 16:15:12 +0000 (00:15 +0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 26 Aug 2015 16:15:12 +0000 (00:15 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Wed, 26 Aug 2015 16:15:12 +0000 (00:15 +0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history