Merge pull request #35984 from matthewoliver/rgw_swift_api_401_for_v1_and_keystone

author J. Eric Ivancich <ivancich@redhat.com>

Thu, 3 Sep 2020 17:01:09 +0000 (13:01 -0400)

committer GitHub <noreply@github.com>

Thu, 3 Sep 2020 17:01:09 +0000 (13:01 -0400)
author J. Eric Ivancich <ivancich@redhat.com>
Thu, 3 Sep 2020 17:01:09 +0000 (13:01 -0400)
committer GitHub <noreply@github.com>
Thu, 3 Sep 2020 17:01:09 +0000 (13:01 -0400)
diff --cc src/rgw/rgw_auth.h
Simple merge
diff --cc src/rgw/rgw_swift_auth.h
Simple merge
author	J. Eric Ivancich <ivancich@redhat.com>
	Thu, 3 Sep 2020 17:01:09 +0000 (13:01 -0400)
committer	GitHub <noreply@github.com>
	Thu, 3 Sep 2020 17:01:09 +0000 (13:01 -0400)
		1	2
src/rgw/rgw_auth.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_swift_auth.h	patch \|	diff1 \|	diff2 \|	blob \| history