hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l..@apache.org
Subject hadoop git commit: HADOOP-12841. Update s3-related properties in core-default.xml. (Wei-Chiu Chuang via lei)
Date Fri, 26 Feb 2016 18:49:19 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 1aa06978e -> 2093acf6b


HADOOP-12841. Update s3-related properties in core-default.xml. (Wei-Chiu Chuang via lei)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2093acf6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2093acf6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2093acf6

Branch: refs/heads/trunk
Commit: 2093acf6b659d5a271b7e97f9b64652d7cf01eef
Parents: 1aa0697
Author: Lei Xu <lei@apache.org>
Authored: Fri Feb 26 10:47:49 2016 -0800
Committer: Lei Xu <lei@apache.org>
Committed: Fri Feb 26 10:47:49 2016 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |  2 ++
 .../src/main/resources/core-default.xml         | 28 +++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2093acf6/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 7315962..106dc64 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -696,6 +696,8 @@ Release 2.9.0 - UNRELEASED
 
     HADOOP-12817. Enable TLS v1.1 and 1.2 (rkanter)
 
+    HADOOP-12841. Update s3-related properties in core-default.xml. (Wei-Chiu Chuang via
lei)
+
   BUG FIXES
 
     HADOOP-12605. Fix intermittent failure of TestIPC.testIpcWithReaderQueuing

http://git-wip-us.apache.org/repos/asf/hadoop/blob/2093acf6/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------
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 dd4919c..95140bf 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
@@ -682,6 +682,16 @@ for ldap providers in the same way as above does.
 </property>
 
 <property>
+  <name>fs.s3.awsAccessKeyId</name>
+  <description>AWS access key ID used by S3 block file system.</description>
+</property>
+
+<property>
+  <name>fs.s3.awsSecretAccessKey</name>
+  <description>AWS secret key used by S3 block file system.</description>
+</property>
+
+<property>
   <name>fs.s3.block.size</name>
   <value>67108864</value>
   <description>Block size to use when writing files to S3.</description>
@@ -728,6 +738,16 @@ for ldap providers in the same way as above does.
 </property>
 
 <property>
+  <name>fs.s3n.awsAccessKeyId</name>
+  <description>AWS access key ID used by S3 native file system.</description>
+</property>
+
+<property>
+  <name>fs.s3n.awsSecretAccessKey</name>
+  <description>AWS secret key used by S3 native file system.</description>
+</property>
+
+<property>
   <name>fs.s3n.block.size</name>
   <value>67108864</value>
   <description>Block size to use when reading files using the native S3
@@ -768,13 +788,13 @@ for ldap providers in the same way as above does.
 </property>
 
 <property>
-  <name>fs.s3a.awsAccessKeyId</name>
-  <description>AWS access key ID. Omit for Role-based authentication.</description>
+  <name>fs.s3a.access.key</name>
+  <description>AWS access key ID used by S3A file system. Omit for Role-based authentication.</description>
 </property>
 
 <property>
-  <name>fs.s3a.awsSecretAccessKey</name>
-  <description>AWS secret key. Omit for Role-based authentication.</description>
+  <name>fs.s3a.secret.key</name>
+  <description>AWS secret key used by S3A file system. Omit for Role-based authentication.</description>
 </property>
 
 <property>


Mime
View raw message