Merge pull request #61996 from cbodley/wip-70171-reef

author Adam Emerson <aemerson@redhat.com>

Mon, 16 Jun 2025 21:01:30 +0000 (17:01 -0400)

committer GitHub <noreply@github.com>

Mon, 16 Jun 2025 21:01:30 +0000 (17:01 -0400)
author Adam Emerson <aemerson@redhat.com>
Mon, 16 Jun 2025 21:01:30 +0000 (17:01 -0400)
committer GitHub <noreply@github.com>
Mon, 16 Jun 2025 21:01:30 +0000 (17:01 -0400)
diff --cc src/rgw/driver/rados/rgw_sal_rados.cc
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Adam Emerson <aemerson@redhat.com>
	Mon, 16 Jun 2025 21:01:30 +0000 (17:01 -0400)
committer	GitHub <noreply@github.com>
	Mon, 16 Jun 2025 21:01:30 +0000 (17:01 -0400)
		1	2
src/rgw/driver/rados/rgw_sal_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history