Merge pull request #34566 from X0Ken/master

author Kefu Chai <kchai@redhat.com>

Fri, 28 Aug 2020 03:01:41 +0000 (11:01 +0800)

committer GitHub <noreply@github.com>

Fri, 28 Aug 2020 03:01:41 +0000 (11:01 +0800)
author Kefu Chai <kchai@redhat.com>
Fri, 28 Aug 2020 03:01:41 +0000 (11:01 +0800)
committer GitHub <noreply@github.com>
Fri, 28 Aug 2020 03:01:41 +0000 (11:01 +0800)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Fri, 28 Aug 2020 03:01:41 +0000 (11:01 +0800)
committer	GitHub <noreply@github.com>
	Fri, 28 Aug 2020 03:01:41 +0000 (11:01 +0800)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history