Merge pull request #46615 from selvakumaar5496/main

author Ali Maredia <amaredia@redhat.com>

Mon, 18 Jul 2022 19:15:56 +0000 (15:15 -0400)

committer GitHub <noreply@github.com>

Mon, 18 Jul 2022 19:15:56 +0000 (15:15 -0400)
author Ali Maredia <amaredia@redhat.com>
Mon, 18 Jul 2022 19:15:56 +0000 (15:15 -0400)
committer GitHub <noreply@github.com>
Mon, 18 Jul 2022 19:15:56 +0000 (15:15 -0400)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Ali Maredia <amaredia@redhat.com>
	Mon, 18 Jul 2022 19:15:56 +0000 (15:15 -0400)
committer	GitHub <noreply@github.com>
	Mon, 18 Jul 2022 19:15:56 +0000 (15:15 -0400)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history