Merge pull request #31879 from joke-lee/rgw-sts-post-upload-auth

author Daniel Gryniewicz <dang@redhat.com>

Wed, 29 Jan 2020 12:48:10 +0000 (07:48 -0500)

committer GitHub <noreply@github.com>

Wed, 29 Jan 2020 12:48:10 +0000 (07:48 -0500)
author Daniel Gryniewicz <dang@redhat.com>
Wed, 29 Jan 2020 12:48:10 +0000 (07:48 -0500)
committer GitHub <noreply@github.com>
Wed, 29 Jan 2020 12:48:10 +0000 (07:48 -0500)
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Daniel Gryniewicz <dang@redhat.com>
	Wed, 29 Jan 2020 12:48:10 +0000 (07:48 -0500)
committer	GitHub <noreply@github.com>
	Wed, 29 Jan 2020 12:48:10 +0000 (07:48 -0500)
		1	2
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history