Merge pull request #39002 from ceph/wip-rgw-multisite-reshard

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

Thu, 2 Jun 2022 20:04:30 +0000 (16:04 -0400)

committer GitHub <noreply@github.com>

Thu, 2 Jun 2022 20:04:30 +0000 (16:04 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Thu, 2 Jun 2022 20:04:30 +0000 (16:04 -0400)
committer GitHub <noreply@github.com>
Thu, 2 Jun 2022 20:04:30 +0000 (16:04 -0400)
diff --cc src/common/options/rgw.yaml.in
Simple merge
diff --cc src/rgw/CMakeLists.txt
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Thu, 2 Jun 2022 20:04:30 +0000 (16:04 -0400)
committer	GitHub <noreply@github.com>
	Thu, 2 Jun 2022 20:04:30 +0000 (16:04 -0400)
		1	2
src/common/options/rgw.yaml.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history