Merge pull request #35962 from smithfarm/wip-46389-octopus

author Yuri Weinstein <yweinste@redhat.com>

Tue, 25 Aug 2020 22:06:56 +0000 (15:06 -0700)

committer GitHub <noreply@github.com>

Tue, 25 Aug 2020 22:06:56 +0000 (15:06 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 25 Aug 2020 22:06:56 +0000 (15:06 -0700)
committer GitHub <noreply@github.com>
Tue, 25 Aug 2020 22:06:56 +0000 (15:06 -0700)
diff --cc src/client/Client.cc

index 5a2cf3d2a2ed37da71336141f5d9b3416b5aefb2,5df9abbc150215af72e136743532d23e85ea8536..5de2eb2e50f0e66d55e3d3ae0182e2cfeae834ef

mode 100755,100644..100755
--- 1/src/client/Client.cc
--- 2/src/client/Client.cc
+++ b/src/client/Client.cc
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 25 Aug 2020 22:06:56 +0000 (15:06 -0700)
committer	GitHub <noreply@github.com>
	Tue, 25 Aug 2020 22:06:56 +0000 (15:06 -0700)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history