From e97613b429f2b85c8d1e6d5a248afed894c90bd2 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Tue, 24 Feb 2015 17:11:46 -0800
Subject: [PATCH] HADOOP-11480. Typo in hadoop-aws/index.md uses wrong scheme
 for test.fs.s3.name. Contributed by Ted Yu.

(cherry picked from commit 1a625b8158ab1cf765fbda962ba725503409d9fe)
---
 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(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index f581c588191..27fee78d11e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -593,6 +593,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
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 1e44864a203..8e80b92593c 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.