Merge pull request #10307 from pritha-srivastava/wip_s3_auth_rework

author Matt Benjamin <mbenjamin@redhat.com>

Wed, 3 Aug 2016 16:39:26 +0000 (12:39 -0400)

committer GitHub <noreply@github.com>

Wed, 3 Aug 2016 16:39:26 +0000 (12:39 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Wed, 3 Aug 2016 16:39:26 +0000 (12:39 -0400)
committer GitHub <noreply@github.com>
Wed, 3 Aug 2016 16:39:26 +0000 (12:39 -0400)
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_json_enc.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.h
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Wed, 3 Aug 2016 16:39:26 +0000 (12:39 -0400)
committer	GitHub <noreply@github.com>
	Wed, 3 Aug 2016 16:39:26 +0000 (12:39 -0400)
		1	2
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_json_enc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.h	patch \|	diff1 \|	diff2 \|	blob \| history