Merge pull request #18340 from Yan-waller/wip-walle-1014osdprimarypg

author Kefu Chai <tchaikov@gmail.com>

Wed, 18 Oct 2017 02:47:37 +0000 (10:47 +0800)

committer GitHub <noreply@github.com>

Wed, 18 Oct 2017 02:47:37 +0000 (10:47 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 18 Oct 2017 02:47:37 +0000 (10:47 +0800)
committer GitHub <noreply@github.com>
Wed, 18 Oct 2017 02:47:37 +0000 (10:47 +0800)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 18 Oct 2017 02:47:37 +0000 (10:47 +0800)
committer	GitHub <noreply@github.com>
	Wed, 18 Oct 2017 02:47:37 +0000 (10:47 +0800)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history