Merge pull request #23522 from pdvian/wip-26846-luminous

author Yuri Weinstein <yweinste@redhat.com>

Fri, 14 Sep 2018 15:41:51 +0000 (08:41 -0700)

committer GitHub <noreply@github.com>

Fri, 14 Sep 2018 15:41:51 +0000 (08:41 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 14 Sep 2018 15:41:51 +0000 (08:41 -0700)
committer GitHub <noreply@github.com>
Fri, 14 Sep 2018 15:41:51 +0000 (08:41 -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>
	Fri, 14 Sep 2018 15:41:51 +0000 (08:41 -0700)
committer	GitHub <noreply@github.com>
	Fri, 14 Sep 2018 15:41:51 +0000 (08:41 -0700)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history