Merge pull request #40251 from singuliere/wip-49854-pacific

author Yuri Weinstein <yweinste@redhat.com>

Fri, 26 Mar 2021 15:31:55 +0000 (08:31 -0700)

committer GitHub <noreply@github.com>

Fri, 26 Mar 2021 15:31:55 +0000 (08:31 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 26 Mar 2021 15:31:55 +0000 (08:31 -0700)
committer GitHub <noreply@github.com>
Fri, 26 Mar 2021 15:31:55 +0000 (08:31 -0700)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 26 Mar 2021 15:31:55 +0000 (08:31 -0700)
committer	GitHub <noreply@github.com>
	Fri, 26 Mar 2021 15:31:55 +0000 (08:31 -0700)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history