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 le...@apache.org on 2016/02/26 19:49:11 UTC
hadoop git commit: HADOOP-12841. Update s3-related properties in
core-default.xml. (Wei-Chiu Chuang via lei)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 1656bcec5 -> 49a10a3ce
HADOOP-12841. Update s3-related properties in core-default.xml. (Wei-Chiu Chuang via lei)
(cherry picked from commit 2093acf6b659d5a271b7e97f9b64652d7cf01eef)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/49a10a3c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/49a10a3c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/49a10a3c
Branch: refs/heads/branch-2
Commit: 49a10a3cec4e1b766ba8a8700539d7bc082003df
Parents: 1656bce
Author: Lei Xu <le...@apache.org>
Authored: Fri Feb 26 10:47:49 2016 -0800
Committer: Lei Xu <le...@apache.org>
Committed: Fri Feb 26 10:48:35 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/49a10a3c/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 6eadf55..7d15ca4 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -43,6 +43,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/49a10a3c/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 839deed..83c9e7c 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
@@ -677,6 +677,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>
@@ -723,6 +733,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
@@ -763,13 +783,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>