Merge pull request #27935 from cbodley/wip-39572

author Yuri Weinstein <yweinste@redhat.com>

Thu, 13 Jun 2019 22:10:47 +0000 (15:10 -0700)

committer GitHub <noreply@github.com>

Thu, 13 Jun 2019 22:10:47 +0000 (15:10 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 13 Jun 2019 22:10:47 +0000 (15:10 -0700)
committer GitHub <noreply@github.com>
Thu, 13 Jun 2019 22:10:47 +0000 (15:10 -0700)
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 13 Jun 2019 22:10:47 +0000 (15:10 -0700)
committer	GitHub <noreply@github.com>
	Thu, 13 Jun 2019 22:10:47 +0000 (15:10 -0700)
		1	2
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history