Merge pull request #25021 from smithfarm/wip-36506-luminous

author Yuri Weinstein <yweinste@redhat.com>

Fri, 4 Jan 2019 22:51:07 +0000 (14:51 -0800)

committer GitHub <noreply@github.com>

Fri, 4 Jan 2019 22:51:07 +0000 (14:51 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 4 Jan 2019 22:51:07 +0000 (14:51 -0800)
committer GitHub <noreply@github.com>
Fri, 4 Jan 2019 22:51:07 +0000 (14:51 -0800)
diff --cc PendingReleaseNotes
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 4 Jan 2019 22:51:07 +0000 (14:51 -0800)
committer	GitHub <noreply@github.com>
	Fri, 4 Jan 2019 22:51:07 +0000 (14:51 -0800)
		1	2
PendingReleaseNotes	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history