Merge pull request #34815 from vumrao/wip-vumrao-45316

author Yuri Weinstein <yweinste@redhat.com>

Wed, 13 May 2020 18:53:07 +0000 (11:53 -0700)

committer GitHub <noreply@github.com>

Wed, 13 May 2020 18:53:07 +0000 (11:53 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 13 May 2020 18:53:07 +0000 (11:53 -0700)
committer GitHub <noreply@github.com>
Wed, 13 May 2020 18:53:07 +0000 (11:53 -0700)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_bucket.cc
Simple merge
diff --cc src/rgw/rgw_bucket.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 13 May 2020 18:53:07 +0000 (11:53 -0700)
committer	GitHub <noreply@github.com>
	Wed, 13 May 2020 18:53:07 +0000 (11:53 -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_bucket.h	patch \|	diff1 \|	diff2 \|	blob \| history