You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2015/05/22 07:16:23 UTC
hadoop git commit: HADOOP-12014. hadoop-config.cmd displays a wrong
error message. Contributed by Kengo Seki.
Repository: hadoop
Updated Branches:
refs/heads/trunk cf2b5694d -> c7fea088f
HADOOP-12014. hadoop-config.cmd displays a wrong error message. Contributed by Kengo Seki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c7fea088
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c7fea088
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c7fea088
Branch: refs/heads/trunk
Commit: c7fea088f7b6c44e4e04bde19dc839975d8ac8ba
Parents: cf2b569
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri May 22 14:13:51 2015 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri May 22 14:15:08 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/c7fea088/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 32f0630..c02b44d 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -737,6 +737,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/c7fea088/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 bf86f1b..6670aca 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
)