Merge pull request #36018 from smithfarm/wip-45922-octopus

author Yuri Weinstein <yweinste@redhat.com>

Tue, 18 Aug 2020 21:29:57 +0000 (14:29 -0700)

committer GitHub <noreply@github.com>

Tue, 18 Aug 2020 21:29:57 +0000 (14:29 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 18 Aug 2020 21:29:57 +0000 (14:29 -0700)
committer GitHub <noreply@github.com>
Tue, 18 Aug 2020 21:29:57 +0000 (14:29 -0700)
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, 18 Aug 2020 21:29:57 +0000 (14:29 -0700)
committer	GitHub <noreply@github.com>
	Tue, 18 Aug 2020 21:29:57 +0000 (14:29 -0700)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history