Merge pull request #20652 from shangfufei/wip-common

author Kefu Chai <tchaikov@gmail.com>

Thu, 15 Mar 2018 06:24:22 +0000 (14:24 +0800)

committer GitHub <noreply@github.com>

Thu, 15 Mar 2018 06:24:22 +0000 (14:24 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 15 Mar 2018 06:24:22 +0000 (14:24 +0800)
committer GitHub <noreply@github.com>
Thu, 15 Mar 2018 06:24:22 +0000 (14:24 +0800)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 15 Mar 2018 06:24:22 +0000 (14:24 +0800)
committer	GitHub <noreply@github.com>
	Thu, 15 Mar 2018 06:24:22 +0000 (14:24 +0800)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history