Merge pull request #37860 from smithfarm/wip-47708-octopus

author Yuri Weinstein <yweinste@redhat.com>

Thu, 17 Dec 2020 20:53:07 +0000 (12:53 -0800)

committer GitHub <noreply@github.com>

Thu, 17 Dec 2020 20:53:07 +0000 (12:53 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 17 Dec 2020 20:53:07 +0000 (12:53 -0800)
committer GitHub <noreply@github.com>
Thu, 17 Dec 2020 20:53:07 +0000 (12:53 -0800)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 17 Dec 2020 20:53:07 +0000 (12:53 -0800)
committer	GitHub <noreply@github.com>
	Thu, 17 Dec 2020 20:53:07 +0000 (12:53 -0800)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history