Merge pull request #28249 from pdvian/wip-39532-mimic

author Yuri Weinstein <yweinste@redhat.com>

Mon, 8 Jul 2019 20:01:21 +0000 (13:01 -0700)

committer GitHub <noreply@github.com>

Mon, 8 Jul 2019 20:01:21 +0000 (13:01 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 8 Jul 2019 20:01:21 +0000 (13:01 -0700)
committer GitHub <noreply@github.com>
Mon, 8 Jul 2019 20:01:21 +0000 (13:01 -0700)
diff --cc src/cls/rgw/cls_rgw.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 8 Jul 2019 20:01:21 +0000 (13:01 -0700)
committer	GitHub <noreply@github.com>
	Mon, 8 Jul 2019 20:01:21 +0000 (13:01 -0700)
		1	2
src/cls/rgw/cls_rgw.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history