Merge pull request #24119 from ukernel/luminous-22504

author Yuri Weinstein <yweinste@redhat.com>

Fri, 28 Sep 2018 20:04:28 +0000 (13:04 -0700)

committer GitHub <noreply@github.com>

Fri, 28 Sep 2018 20:04:28 +0000 (13:04 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 28 Sep 2018 20:04:28 +0000 (13:04 -0700)
committer GitHub <noreply@github.com>
Fri, 28 Sep 2018 20:04:28 +0000 (13:04 -0700)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 28 Sep 2018 20:04:28 +0000 (13:04 -0700)
committer	GitHub <noreply@github.com>
	Fri, 28 Sep 2018 20:04:28 +0000 (13:04 -0700)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history