HADOOP-4837. Move HADOOP_CONF_DIR configuration to chukwa-env.sh Contributed by Jerome Boulon

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@725831 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -340,6 +340,9 @@ Trunk (unreleased changes)
     HADOOP-4805. Remove black list collector from Chukwa Agent HTTP Sender.
     (Eric Yang via cdouglas)
 
+    HADOOP-4837. Move HADOOP_CONF_DIR configuration to chukwa-env.sh (Jerome
+    Boulon via cdouglas)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

src/contrib/chukwa/bin/processSinkFiles.sh

@@ -27,7 +27,6 @@ fi
 trap 'remove_cron;rm -f $CHUKWA_HOME/var/run/chukwa-$CHUKWA_IDENT_STRING-processSinkFiles.sh.pid ${CHUKWA_HOME}/var/run/ProcessSinkFiles.pid; exit 0' 1 2 15
 echo "${pid}" > "$CHUKWA_HOME/var/run/ProcessSinkFiles.pid"
 
-HADOOP_CONF_DIR="${HADOOP_HOME}/conf/"
 HADOOP_CMDE="${HADOOP_HOME}/bin/hadoop "
 
 function remove_cron {

src/contrib/chukwa/conf/chukwa-env.sh

@@ -11,6 +11,7 @@ export JAVA_HOME=/usr/lib/j2sdk1.5-sun
 # The location of the Hadoop the collector should use. Default 
 # assumes that this chukwa is living in hadoop's src/contrib directory
 export HADOOP_HOME="/usr/lib/hadoop/current"
+export HADOOP_CONF_DIR="${HADOOP_HOME}/conf/"
 
 # The directory where pid files are stored. CHUKWA_HOME/var/run by default.
 #export CHUKWA_PID_DIR=