Merge pull request #57405 from ivancich/wip-65891-quincy

author Yuri Weinstein <yweinste@redhat.com>

Tue, 6 Aug 2024 15:21:14 +0000 (08:21 -0700)

committer GitHub <noreply@github.com>

Tue, 6 Aug 2024 15:21:14 +0000 (08:21 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 6 Aug 2024 15:21:14 +0000 (08:21 -0700)
committer GitHub <noreply@github.com>
Tue, 6 Aug 2024 15:21:14 +0000 (08:21 -0700)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 6 Aug 2024 15:21:14 +0000 (08:21 -0700)
committer	GitHub <noreply@github.com>
	Tue, 6 Aug 2024 15:21:14 +0000 (08:21 -0700)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history