hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1143511 - in /hadoop/common/trunk/common: CHANGES.txt bin/hadoop-config.sh
Date Wed, 06 Jul 2011 18:02:20 GMT
Author: todd
Date: Wed Jul  6 18:02:20 2011
New Revision: 1143511

URL: http://svn.apache.org/viewvc?rev=1143511&view=rev
Log:
HADOOP-7419. new hadoop-config.sh doesn't manage classpath for HADOOP_CONF_DIR correctly.
Contributed by Bing Zheng and Todd Lipcon.

Modified:
    hadoop/common/trunk/common/CHANGES.txt
    hadoop/common/trunk/common/bin/hadoop-config.sh

Modified: hadoop/common/trunk/common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/common/CHANGES.txt?rev=1143511&r1=1143510&r2=1143511&view=diff
==============================================================================
--- hadoop/common/trunk/common/CHANGES.txt (original)
+++ hadoop/common/trunk/common/CHANGES.txt Wed Jul  6 18:02:20 2011
@@ -355,6 +355,9 @@ Trunk (unreleased changes)
     HADOOP-7442. Docs in core-default.xml still reference deprecated config
     "topology.script.file.name" (atm)
 
+    HADOOP-7419. new hadoop-config.sh doesn't manage classpath for
+    HADOOP_CONF_DIR correctly. (Bing Zheng and todd via todd)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/trunk/common/bin/hadoop-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/common/bin/hadoop-config.sh?rev=1143511&r1=1143510&r2=1143511&view=diff
==============================================================================
--- hadoop/common/trunk/common/bin/hadoop-config.sh (original)
+++ hadoop/common/trunk/common/bin/hadoop-config.sh Wed Jul  6 18:02:20 2011
@@ -285,7 +285,7 @@ if [ -d "${HADOOP_HDFS_HOME}" ]; then
     CLASSPATH=${CLASSPATH}:$HADOOP_HDFS_HOME
   fi
   
-  if [ -d "${HADOOP_HDFS_HOME}/conf" ]; then
+  if [ ! -d "${HADOOP_CONF_DIR}" ] && [ -d "${HADOOP_HDFS_HOME}/conf" ]; then
     CLASSPATH=${CLASSPATH}:${HADOOP_HDFS_HOME}/conf
   fi
   
@@ -323,7 +323,7 @@ if [ -d "${HADOOP_MAPRED_HOME}" ]; then
     CLASSPATH=${CLASSPATH}:$HADOOP_MAPRED_HOME
   fi
 
-  if [ -d "${HADOOP_MAPRED_HOME}/conf" ]; then
+  if [ ! -d "${HADOOP_CONF_DIR}" ] && [ -d "${HADOOP_MAPRED_HOME}/conf" ]; then
     CLASSPATH=${CLASSPATH}:${HADOOP_MAPRED_HOME}/conf
   fi
   



Mime
View raw message