Merge pull request #30172 from smithfarm/wip-41632-mimic

author Yuri Weinstein <yweinste@redhat.com>

Tue, 8 Oct 2019 19:55:29 +0000 (12:55 -0700)

committer GitHub <noreply@github.com>

Tue, 8 Oct 2019 19:55:29 +0000 (12:55 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 8 Oct 2019 19:55:29 +0000 (12:55 -0700)
committer GitHub <noreply@github.com>
Tue, 8 Oct 2019 19:55:29 +0000 (12:55 -0700)
diff --cc doc/radosgw/multisite.rst
Simple merge
diff --cc src/rgw/rgw_admin.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 8 Oct 2019 19:55:29 +0000 (12:55 -0700)
committer	GitHub <noreply@github.com>
	Tue, 8 Oct 2019 19:55:29 +0000 (12:55 -0700)
		1	2
doc/radosgw/multisite.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history