Merge pull request #32660 from cbodley/wip-rgw-admin-zone-shards

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

Mon, 2 Mar 2020 14:38:04 +0000 (09:38 -0500)

committer GitHub <noreply@github.com>

Mon, 2 Mar 2020 14:38:04 +0000 (09:38 -0500)
author Casey Bodley <cbodley@users.noreply.github.com>
Mon, 2 Mar 2020 14:38:04 +0000 (09:38 -0500)
committer GitHub <noreply@github.com>
Mon, 2 Mar 2020 14:38:04 +0000 (09:38 -0500)
diff --cc src/common/options.cc
Simple merge
diff --cc src/rgw/rgw_zone.cc
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Mon, 2 Mar 2020 14:38:04 +0000 (09:38 -0500)
committer	GitHub <noreply@github.com>
	Mon, 2 Mar 2020 14:38:04 +0000 (09:38 -0500)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_zone.cc	patch \|	diff1 \|	diff2 \|	blob \| history