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 0273817A29 for ; Fri, 22 May 2015 05:16:55 +0000 (UTC) Received: (qmail 4722 invoked by uid 500); 22 May 2015 05:16:49 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 4658 invoked by uid 500); 22 May 2015 05:16:49 -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 4649 invoked by uid 99); 22 May 2015 05:16:49 -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; Fri, 22 May 2015 05:16:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6B43DFDC3; Fri, 22 May 2015 05:16:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: <48db0e1628b64b66a6f0571b5e703d3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-12014. hadoop-config.cmd displays a wrong error message. Contributed by Kengo Seki. Date: Fri, 22 May 2015 05:16:48 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 a073e5bd3 -> 6cd767287 HADOOP-12014. hadoop-config.cmd displays a wrong error message. Contributed by Kengo Seki. (cherry picked from commit 07007bdbc8900cfe8421f4829b1444fc9e7aceb7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6cd76728 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6cd76728 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6cd76728 Branch: refs/heads/branch-2 Commit: 6cd767287845e1314964e78df2999b05c3cd6c38 Parents: a073e5b Author: Akira Ajisaka Authored: Fri May 22 14:13:51 2015 +0900 Committer: Akira Ajisaka Committed: Fri May 22 14:15:37 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/bin/hadoop-config.cmd | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6cd76728/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 e58e9cb..681b4b8 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -272,6 +272,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12000. cannot use --java-home in test-patch (aw) + HADOOP-12014. hadoop-config.cmd displays a wrong error message. + (Kengo Seki via aajisaka) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/6cd76728/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd index 13fb64c..f8d71ba 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd @@ -115,7 +115,7 @@ if not defined JAVA_HOME ( if not exist %JAVA_HOME%\bin\java.exe ( echo Error: JAVA_HOME is incorrectly set. - echo Please update %HADOOP_HOME%\conf\hadoop-env.cmd + echo Please update %HADOOP_CONF_DIR%\hadoop-env.cmd goto :eof )