Merge pull request #37066 from smanjara/wip-metadata-reshard

author J. Eric Ivancich <ivancich@redhat.com>

Wed, 4 Nov 2020 15:00:48 +0000 (10:00 -0500)

committer GitHub <noreply@github.com>

Wed, 4 Nov 2020 15:00:48 +0000 (10:00 -0500)
author J. Eric Ivancich <ivancich@redhat.com>
Wed, 4 Nov 2020 15:00:48 +0000 (10:00 -0500)
committer GitHub <noreply@github.com>
Wed, 4 Nov 2020 15:00:48 +0000 (10:00 -0500)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_bucket.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	J. Eric Ivancich <ivancich@redhat.com>
	Wed, 4 Nov 2020 15:00:48 +0000 (10:00 -0500)
committer	GitHub <noreply@github.com>
	Wed, 4 Nov 2020 15:00:48 +0000 (10:00 -0500)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history