Repository: hadoop Updated Branches: refs/heads/branch-2 5c0073e70 -> e97613b42
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) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e97613b4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e97613b4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e97613b4 Branch: refs/heads/branch-2 Commit: e97613b429f2b85c8d1e6d5a248afed894c90bd2 Parents: 5c0073e Author: Akira Ajisaka <[email protected]> Authored: Tue Feb 24 17:11:46 2015 -0800 Committer: Akira Ajisaka <[email protected]> Committed: Tue Feb 24 17:13:35 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/e97613b4/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 f581c58..27fee78 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/e97613b4/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.
