Merge pull request #40261 from singuliere/wip-49310-pacific

author Casey Bodley <cbodley@users.noreply.github.com>

Wed, 24 Mar 2021 15:47:38 +0000 (11:47 -0400)

committer GitHub <noreply@github.com>

Wed, 24 Mar 2021 15:47:38 +0000 (11:47 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Wed, 24 Mar 2021 15:47:38 +0000 (11:47 -0400)
committer GitHub <noreply@github.com>
Wed, 24 Mar 2021 15:47:38 +0000 (11:47 -0400)
diff --cc doc/radosgw/notifications.rst
Simple merge
diff --cc doc/radosgw/pubsub-module.rst
Simple merge
diff --cc src/rgw/CMakeLists.txt
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Wed, 24 Mar 2021 15:47:38 +0000 (11:47 -0400)
committer	GitHub <noreply@github.com>
	Wed, 24 Mar 2021 15:47:38 +0000 (11:47 -0400)
		1	2
doc/radosgw/notifications.rst	patch \|	diff1 \|	diff2 \|	blob \| history
doc/radosgw/pubsub-module.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history