Merge pull request #35150 from Vicente-Cheng/wip-45599-octopus

author Yuri Weinstein <yweinste@redhat.com>

Tue, 26 May 2020 22:16:32 +0000 (15:16 -0700)

committer GitHub <noreply@github.com>

Tue, 26 May 2020 22:16:32 +0000 (15:16 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 26 May 2020 22:16:32 +0000 (15:16 -0700)
committer GitHub <noreply@github.com>
Tue, 26 May 2020 22:16:32 +0000 (15:16 -0700)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 26 May 2020 22:16:32 +0000 (15:16 -0700)
committer	GitHub <noreply@github.com>
	Tue, 26 May 2020 22:16:32 +0000 (15:16 -0700)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history