Merge pull request #50894 from cfsnyder/wip-59330-pacific

author Radoslaw Zarzynski <rzarzyns@redhat.com>

Fri, 5 May 2023 15:31:17 +0000 (17:31 +0200)

committer GitHub <noreply@github.com>

Fri, 5 May 2023 15:31:17 +0000 (17:31 +0200)
author Radoslaw Zarzynski <rzarzyns@redhat.com>
Fri, 5 May 2023 15:31:17 +0000 (17:31 +0200)
committer GitHub <noreply@github.com>
Fri, 5 May 2023 15:31:17 +0000 (17:31 +0200)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Radoslaw Zarzynski <rzarzyns@redhat.com>
	Fri, 5 May 2023 15:31:17 +0000 (17:31 +0200)
committer	GitHub <noreply@github.com>
	Fri, 5 May 2023 15:31:17 +0000 (17:31 +0200)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history