Merge pull request #24944 from jonsger/luminous-backport-pr#24700

author Yuri Weinstein <yweinste@redhat.com>

Wed, 12 Dec 2018 16:48:02 +0000 (08:48 -0800)

committer GitHub <noreply@github.com>

Wed, 12 Dec 2018 16:48:02 +0000 (08:48 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 12 Dec 2018 16:48:02 +0000 (08:48 -0800)
committer GitHub <noreply@github.com>
Wed, 12 Dec 2018 16:48:02 +0000 (08:48 -0800)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 12 Dec 2018 16:48:02 +0000 (08:48 -0800)
committer	GitHub <noreply@github.com>
	Wed, 12 Dec 2018 16:48:02 +0000 (08:48 -0800)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history