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 <[email protected]> Authored: Fri May 22 14:13:51 2015 +0900 Committer: Akira Ajisaka <[email protected]> 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 )
