Merge pull request #27583 from xiexingguo/wip-38242

author Yuri Weinstein <yweinste@redhat.com>

Tue, 9 Jul 2019 16:06:55 +0000 (09:06 -0700)

committer GitHub <noreply@github.com>

Tue, 9 Jul 2019 16:06:55 +0000 (09:06 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 9 Jul 2019 16:06:55 +0000 (09:06 -0700)
committer GitHub <noreply@github.com>
Tue, 9 Jul 2019 16:06:55 +0000 (09:06 -0700)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 9 Jul 2019 16:06:55 +0000 (09:06 -0700)
committer	GitHub <noreply@github.com>
	Tue, 9 Jul 2019 16:06:55 +0000 (09:06 -0700)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history