Merge pull request #42643 from cfsnyder/wip-51803-pacific

author Yuri Weinstein <yweinste@redhat.com>

Tue, 5 Oct 2021 14:59:37 +0000 (07:59 -0700)

committer GitHub <noreply@github.com>

Tue, 5 Oct 2021 14:59:37 +0000 (07:59 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 5 Oct 2021 14:59:37 +0000 (07:59 -0700)
committer GitHub <noreply@github.com>
Tue, 5 Oct 2021 14:59:37 +0000 (07:59 -0700)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/test/rgw/rgw_multi/tests_ps.py
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 5 Oct 2021 14:59:37 +0000 (07:59 -0700)
committer	GitHub <noreply@github.com>
	Tue, 5 Oct 2021 14:59:37 +0000 (07:59 -0700)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/rgw/rgw_multi/tests_ps.py	patch \|	diff1 \|	diff2 \|	blob \| history