Merge pull request #14885 from rzarzynski/wip-rgw-auth-rework-cont-3-awsv4

author Matt Benjamin <mbenjamin@redhat.com>

Tue, 13 Jun 2017 21:16:20 +0000 (17:16 -0400)

committer GitHub <noreply@github.com>

Tue, 13 Jun 2017 21:16:20 +0000 (17:16 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Tue, 13 Jun 2017 21:16:20 +0000 (17:16 -0400)
committer GitHub <noreply@github.com>
Tue, 13 Jun 2017 21:16:20 +0000 (17:16 -0400)
diff --cc src/rgw/rgw_common.cc
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Tue, 13 Jun 2017 21:16:20 +0000 (17:16 -0400)
committer	GitHub <noreply@github.com>
	Tue, 13 Jun 2017 21:16:20 +0000 (17:16 -0400)
		1	2
src/rgw/rgw_common.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history