Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-7419. new hadoop-config.sh doesn't manage classpath for HADOOP_CONF_DIR correctly. Contributed by Bing Zheng and Todd Lipcon. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1143511 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2011-07-06 18:02:20 +00:00
parent ff0511019c
commit 952d970480
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/CHANGES.txt
View File

@ -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

4
common/bin/hadoop-config.sh
View File

@ -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