Merge pull request #26129 from pdvian/wip-38039-mimic

author Yuri Weinstein <yweinste@redhat.com>

Mon, 18 Feb 2019 17:37:42 +0000 (09:37 -0800)

committer GitHub <noreply@github.com>

Mon, 18 Feb 2019 17:37:42 +0000 (09:37 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 18 Feb 2019 17:37:42 +0000 (09:37 -0800)
committer GitHub <noreply@github.com>
Mon, 18 Feb 2019 17:37:42 +0000 (09:37 -0800)
diff --cc src/rgw/rgw_auth_s3.h
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 18 Feb 2019 17:37:42 +0000 (09:37 -0800)
committer	GitHub <noreply@github.com>
	Mon, 18 Feb 2019 17:37:42 +0000 (09:37 -0800)
		1	2
src/rgw/rgw_auth_s3.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history