You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by li...@apache.org on 2019/12/06 01:56:20 UTC

[hadoop] branch branch-2 updated: HADOOP-16735. Make it clearer in config default that EnvironmentVariableCredentialsProvider supports AWS_SESSION_TOKEN. Contributed by Mingliang Liu

This is an automated email from the ASF dual-hosted git repository.

liuml07 pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new cdb0caf  HADOOP-16735. Make it clearer in config default that EnvironmentVariableCredentialsProvider supports AWS_SESSION_TOKEN. Contributed by Mingliang Liu
cdb0caf is described below

commit cdb0cafff510ca9e9ce395dc404bb26218f82b6f
Author: Mingliang Liu <li...@apache.org>
AuthorDate: Thu Dec 5 17:36:51 2019 -0800

    HADOOP-16735. Make it clearer in config default that EnvironmentVariableCredentialsProvider supports AWS_SESSION_TOKEN. Contributed by Mingliang Liu
    
    This closes #1733
---
 .../hadoop-common/src/main/resources/core-default.xml                 | 4 ++--
 hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index 5eb4dbd..699493f 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -1072,8 +1072,8 @@
         fs.s3a.access.key and fs.s3a.secret.key.
     2. com.amazonaws.auth.EnvironmentVariableCredentialsProvider: supports
         configuration of AWS access key ID and secret access key in
-        environment variables named AWS_ACCESS_KEY_ID and
-        AWS_SECRET_ACCESS_KEY, as documented in the AWS SDK.
+        environment variables named AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
+        and AWS_SESSION_TOKEN as documented in the AWS SDK.
     3. org.apache.hadoop.fs.s3a.SharedInstanceProfileCredentialsProvider:
         a shared instance of
         com.amazonaws.auth.InstanceProfileCredentialsProvider from the AWS
diff --git a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
index 9318ed1..519540c 100644
--- a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
+++ b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
@@ -355,8 +355,8 @@ of `com.amazonaws.auth.AWSCredentialsProvider` may also be used.
             See also fs.s3a.access.key and fs.s3a.secret.key.
         2. com.amazonaws.auth.EnvironmentVariableCredentialsProvider: supports
             configuration of AWS access key ID and secret access key in
-            environment variables named AWS_ACCESS_KEY_ID and
-            AWS_SECRET_ACCESS_KEY, as documented in the AWS SDK.
+            environment variables named AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
+            and AWS_SESSION_TOKEN as documented in the AWS SDK.
         3. com.amazonaws.auth.InstanceProfileCredentialsProvider: supports use
             of instance profile credentials if running in an EC2 VM.
       </description>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org