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 zh...@apache.org on 2015/03/02 18:15:21 UTC

[05/50] [abbrv] hadoop git commit: HADOOP-11480. Typo in hadoop-aws/index.md uses wrong scheme for test.fs.s3.name. Contributed by Ted Yu.

HADOOP-11480. Typo in hadoop-aws/index.md uses wrong scheme for test.fs.s3.name. Contributed by Ted Yu.


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

Branch: refs/heads/HDFS-7285
Commit: ef3702ef300b5d897592d9d9a5990282c3e0f36a
Parents: fe66fe4
Author: Akira Ajisaka <aa...@apache.org>
Authored: Tue Feb 24 17:11:46 2015 -0800
Committer: Zhe Zhang <zh...@cloudera.com>
Committed: Mon Mar 2 09:13:50 2015 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                  | 3 +++
 .../hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef3702ef/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 96d5724..a5a11b9 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -996,6 +996,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11619. FTPFileSystem should override getDefaultPort.
     (Brahma Reddy Battula via gera)
 
+    HADOOP-11480. Typo in hadoop-aws/index.md uses wrong scheme for
+    test.fs.s3.name. (Ted Yu via aajisaka)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef3702ef/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
----------------------------------------------------------------------
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 1e44864..8e80b92 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
@@ -353,7 +353,7 @@ Example:
     
       <property>
         <name>test.fs.s3.name</name>
-        <value>s3a://test-aws-s3/</value>
+        <value>s3://test-aws-s3/</value>
       </property>
   
       <property>
@@ -493,4 +493,4 @@ Example:
 This example pulls in the `auth-keys.xml` file for the credentials. 
 This provides one single place to keep the keys up to date —and means
 that the file `contract-test-options.xml` does not contain any
-secret credentials itself.
\ No newline at end of file
+secret credentials itself.