HADOOP-10140. Specification of HADOOP_CONF_DIR via the environment in hadoop_config.cmd. Contributed by Kiran Kumar M R.
(cherry picked from commit 67efab935e0366ff783cf2bbd2363da4ebb02772) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c9266132 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c9266132 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c9266132 Branch: refs/heads/branch-2 Commit: c9266132eeaf20417754e9c70e3e3f5fe65f67a6 Parents: 65a6cf4 Author: cnauroth <cnaur...@apache.org> Authored: Wed Feb 11 16:36:09 2015 -0800 Committer: cnauroth <cnaur...@apache.org> Committed: Wed Feb 11 16:36:18 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/c9266132/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 2d8c7c2..5d474c7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -185,6 +185,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/c9266132/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 a8b6204..13fb64c 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.
