Merge pull request #38377 from yanghonggang/master

author Harish Munjulur <harishmunjulur@gmail.com>

Thu, 7 Jan 2021 15:11:25 +0000 (07:11 -0800)

committer GitHub <noreply@github.com>

Thu, 7 Jan 2021 15:11:25 +0000 (07:11 -0800)
author Harish Munjulur <harishmunjulur@gmail.com>
Thu, 7 Jan 2021 15:11:25 +0000 (07:11 -0800)
committer GitHub <noreply@github.com>
Thu, 7 Jan 2021 15:11:25 +0000 (07:11 -0800)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Harish Munjulur <harishmunjulur@gmail.com>
	Thu, 7 Jan 2021 15:11:25 +0000 (07:11 -0800)
committer	GitHub <noreply@github.com>
	Thu, 7 Jan 2021 15:11:25 +0000 (07:11 -0800)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history