Merge pull request #37253 from bstillwell/wip-47424-octopus

author Yuri Weinstein <yweinste@redhat.com>

Fri, 2 Oct 2020 18:20:16 +0000 (11:20 -0700)

committer GitHub <noreply@github.com>

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