big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lei Xu 2016-02-26 10:47:49 -08:00
parent 1aa06978e9
commit 2093acf6b6
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -696,6 +696,8 @@ Release 2.9.0 - UNRELEASED
HADOOP-12817. Enable TLS v1.1 and 1.2 (rkanter) 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 BUG FIXES
HADOOP-12605. Fix intermittent failure of TestIPC.testIpcWithReaderQueuing HADOOP-12605. Fix intermittent failure of TestIPC.testIpcWithReaderQueuing

28
hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
View File

@ -681,6 +681,16 @@ for ldap providers in the same way as above does.
<description>File space usage statistics refresh interval in msec.</description> <description>File space usage statistics refresh interval in msec.</description>
</property> </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> <property>
<name>fs.s3.block.size</name> <name>fs.s3.block.size</name>
<value>67108864</value> <value>67108864</value>
@ -727,6 +737,16 @@ for ldap providers in the same way as above does.
</description> </description>
</property> </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> <property>
<name>fs.s3n.block.size</name> <name>fs.s3n.block.size</name>
<value>67108864</value> <value>67108864</value>
@ -768,13 +788,13 @@ for ldap providers in the same way as above does.
</property> </property>
<property> <property>
<name>fs.s3a.awsAccessKeyId</name> <name>fs.s3a.access.key</name>
<description>AWS access key ID. Omit for Role-based authentication.</description> <description>AWS access key ID used by S3A file system. Omit for Role-based authentication.</description>
</property> </property>
<property> <property>
<name>fs.s3a.awsSecretAccessKey</name> <name>fs.s3a.secret.key</name>
<description>AWS secret key. Omit for Role-based authentication.</description> <description>AWS secret key used by S3A file system. Omit for Role-based authentication.</description>
</property> </property>
<property> <property>