Merge pull request #42566 from cfsnyder/wip-51514-pacific

author Yuri Weinstein <yweinste@redhat.com>

Sat, 7 Aug 2021 16:23:00 +0000 (09:23 -0700)

committer GitHub <noreply@github.com>

Sat, 7 Aug 2021 16:23:00 +0000 (09:23 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Sat, 7 Aug 2021 16:23:00 +0000 (09:23 -0700)
committer GitHub <noreply@github.com>
Sat, 7 Aug 2021 16:23:00 +0000 (09:23 -0700)
diff --cc src/rgw/rgw_notify.cc
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Sat, 7 Aug 2021 16:23:00 +0000 (09:23 -0700)
committer	GitHub <noreply@github.com>
	Sat, 7 Aug 2021 16:23:00 +0000 (09:23 -0700)
		1	2
src/rgw/rgw_notify.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history