Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DB14E10133 for ; Wed, 25 Feb 2015 01:14:57 +0000 (UTC) Received: (qmail 84085 invoked by uid 500); 25 Feb 2015 01:14:57 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 84011 invoked by uid 500); 25 Feb 2015 01:14:57 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 84002 invoked by uid 99); 25 Feb 2015 01:14:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Feb 2015 01:14:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 875D2E03E8; Wed, 25 Feb 2015 01:14:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: <4c133f7ce3c240339db6f321f280a6b0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-11480. Typo in hadoop-aws/index.md uses wrong scheme for test.fs.s3.name. Contributed by Ted Yu. Date: Wed, 25 Feb 2015 01:14:57 +0000 (UTC) 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 Authored: Tue Feb 24 17:11:46 2015 -0800 Committer: Akira Ajisaka 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: test.fs.s3.name - s3a://test-aws-s3/ + s3://test-aws-s3/ @@ -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.