Merge pull request #29258 from smithfarm/wip-39741-mimic

author Yuri Weinstein <yweinste@redhat.com>

Fri, 11 Oct 2019 20:23:59 +0000 (13:23 -0700)

committer GitHub <noreply@github.com>

Fri, 11 Oct 2019 20:23:59 +0000 (13:23 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 11 Oct 2019 20:23:59 +0000 (13:23 -0700)
committer GitHub <noreply@github.com>
Fri, 11 Oct 2019 20:23:59 +0000 (13:23 -0700)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_bucket.cc
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 11 Oct 2019 20:23:59 +0000 (13:23 -0700)
committer	GitHub <noreply@github.com>
	Fri, 11 Oct 2019 20:23:59 +0000 (13:23 -0700)
		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_common.h	patch \|	diff1 \|	diff2 \|	blob \| history