hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject [1/2] hadoop git commit: HADOOP-10140. Specification of HADOOP_CONF_DIR via the environment in hadoop_config.cmd. Contributed by Kiran Kumar M R.
Date Thu, 12 Feb 2015 00:36:48 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 65a6cf47e -> c9266132e
  refs/heads/trunk fe689d34a -> 67efab935


HADOOP-10140. Specification of HADOOP_CONF_DIR via the environment in hadoop_config.cmd. Contributed
by Kiran Kumar M R.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/67efab93
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/67efab93
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/67efab93

Branch: refs/heads/trunk
Commit: 67efab935e0366ff783cf2bbd2363da4ebb02772
Parents: fe689d3
Author: cnauroth <cnauroth@apache.org>
Authored: Wed Feb 11 16:36:09 2015 -0800
Committer: cnauroth <cnauroth@apache.org>
Committed: Wed Feb 11 16:36:09 2015 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                  | 3 +++
 .../hadoop-common/src/main/bin/hadoop-config.cmd                 | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/67efab93/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 3043fb3..806fb1f 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -591,6 +591,9 @@ Release 2.7.0 - UNRELEASED
 
     HADOOP-11579. Documentation for truncate. (shv)
 
+    HADOOP-10140. Specification of HADOOP_CONF_DIR via the environment in
+    hadoop_config.cmd. (Kiran Kumar M R via cnauroth)
+
   OPTIMIZATIONS
 
     HADOOP-11323. WritableComparator#compare keeps reference to byte array.

http://git-wip-us.apache.org/repos/asf/hadoop/blob/67efab93/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 8ae70fb..bf86f1b 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
@@ -65,7 +65,9 @@ if not exist %HADOOP_HOME%\share\hadoop\common\hadoop-common-*.jar (
     exit /b 1
 )
 
-set HADOOP_CONF_DIR=%HADOOP_HOME%\etc\hadoop
+if not defined HADOOP_CONF_DIR (
+  set HADOOP_CONF_DIR=%HADOOP_HOME%\etc\hadoop
+)
 
 @rem
 @rem Allow alternate conf dir location.


Mime
View raw message