Merge pull request #19250 from qrGitHub/wip-rgw-unused-param2

author Yuri Weinstein <yuri.weinstein@gmail.com>

Tue, 12 Dec 2017 16:25:54 +0000 (08:25 -0800)

committer GitHub <noreply@github.com>

Tue, 12 Dec 2017 16:25:54 +0000 (08:25 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Tue, 12 Dec 2017 16:25:54 +0000 (08:25 -0800)
committer GitHub <noreply@github.com>
Tue, 12 Dec 2017 16:25:54 +0000 (08:25 -0800)
diff --cc src/rgw/rgw_auth_s3.cc
Simple merge
diff --cc src/rgw/rgw_auth_s3.h
Simple merge
diff --cc src/rgw/rgw_rest_s3.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Tue, 12 Dec 2017 16:25:54 +0000 (08:25 -0800)
committer	GitHub <noreply@github.com>
	Tue, 12 Dec 2017 16:25:54 +0000 (08:25 -0800)
		1	2
src/rgw/rgw_auth_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_auth_s3.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.h	patch \|	diff1 \|	diff2 \|	blob \| history