Merge pull request #28408 from cbodley/wip-40149

author Yuri Weinstein <yweinste@redhat.com>

Mon, 22 Jul 2019 19:55:01 +0000 (12:55 -0700)

committer GitHub <noreply@github.com>

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