From c9266132eeaf20417754e9c70e3e3f5fe65f67a6 Mon Sep 17 00:00:00 2001
From: cnauroth <cnauroth@apache.org>
Date: Wed, 11 Feb 2015 16:36:09 -0800
Subject: [PATCH] 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)
---
 hadoop-common-project/hadoop-common/CHANGES.txt               | 3 +++
 .../hadoop-common/src/main/bin/hadoop-config.cmd              | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 2d8c7c27b0b..5d474c70625 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.
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 a8b62040ed2..13fb64c44b9 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.