Merge pull request #35465 from pritha-srivastava/wip-sts-token-fields-op-logs

author Matt Benjamin <mbenjamin@redhat.com>

Thu, 9 Jul 2020 11:48:50 +0000 (07:48 -0400)

committer GitHub <noreply@github.com>

Thu, 9 Jul 2020 11:48:50 +0000 (07:48 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Thu, 9 Jul 2020 11:48:50 +0000 (07:48 -0400)
committer GitHub <noreply@github.com>
Thu, 9 Jul 2020 11:48:50 +0000 (07:48 -0400)
diff --cc src/rgw/rgw_auth_s3.h
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Thu, 9 Jul 2020 11:48:50 +0000 (07:48 -0400)
committer	GitHub <noreply@github.com>
	Thu, 9 Jul 2020 11:48:50 +0000 (07:48 -0400)
		1	2
src/rgw/rgw_auth_s3.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history