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

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

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

@@ -681,6 +681,16 @@ for ldap providers in the same way as above does.
   <description>File space usage statistics refresh interval in msec.</description>
 </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>
@@ -727,6 +737,16 @@ for ldap providers in the same way as above does.
   </description>
 </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>
@@ -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>