Merge pull request #24906 from tchaikov/wip-23673-luminous

author Yuri Weinstein <yweinste@redhat.com>

Thu, 21 Feb 2019 23:29:07 +0000 (15:29 -0800)

committer GitHub <noreply@github.com>

Thu, 21 Feb 2019 23:29:07 +0000 (15:29 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 21 Feb 2019 23:29:07 +0000 (15:29 -0800)
committer GitHub <noreply@github.com>
Thu, 21 Feb 2019 23:29:07 +0000 (15:29 -0800)
diff --cc PendingReleaseNotes
Simple merge
diff --cc src/mon/AuthMonitor.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 21 Feb 2019 23:29:07 +0000 (15:29 -0800)
committer	GitHub <noreply@github.com>
	Thu, 21 Feb 2019 23:29:07 +0000 (15:29 -0800)
		1	2
PendingReleaseNotes	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/AuthMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history