Merge pull request #41367 from cbodley/wip-50845

author Yuri Weinstein <yweinste@redhat.com>

Sat, 7 Aug 2021 16:22:13 +0000 (09:22 -0700)

committer GitHub <noreply@github.com>

Sat, 7 Aug 2021 16:22:13 +0000 (09:22 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Sat, 7 Aug 2021 16:22:13 +0000 (09:22 -0700)
committer GitHub <noreply@github.com>
Sat, 7 Aug 2021 16:22:13 +0000 (09:22 -0700)
diff --cc PendingReleaseNotes
Simple merge
diff --cc doc/radosgw/frontends.rst
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Sat, 7 Aug 2021 16:22:13 +0000 (09:22 -0700)
committer	GitHub <noreply@github.com>
	Sat, 7 Aug 2021 16:22:13 +0000 (09:22 -0700)
		1	2
PendingReleaseNotes	patch \|	diff1 \|	diff2 \|	blob \| history
doc/radosgw/frontends.rst	patch \|	diff1 \|	diff2 \|	blob \| history