Merge pull request #40896 from jdurgin/wip-yaml-options-fix

author Kefu Chai <kchai@redhat.com>

Mon, 19 Apr 2021 08:26:04 +0000 (16:26 +0800)

committer GitHub <noreply@github.com>

Mon, 19 Apr 2021 08:26:04 +0000 (16:26 +0800)
author Kefu Chai <kchai@redhat.com>
Mon, 19 Apr 2021 08:26:04 +0000 (16:26 +0800)
committer GitHub <noreply@github.com>
Mon, 19 Apr 2021 08:26:04 +0000 (16:26 +0800)
diff --cc src/common/options/global.yaml.in
Simple merge
diff --cc src/common/options/y2c.py
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Mon, 19 Apr 2021 08:26:04 +0000 (16:26 +0800)
committer	GitHub <noreply@github.com>
	Mon, 19 Apr 2021 08:26:04 +0000 (16:26 +0800)
		1	2
src/common/options/global.yaml.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options/y2c.py	patch \|	diff1 \|	diff2 \|	blob \| history