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

Merge -r 1338999:1339000 from trunk to branch. FIXES: MAPREDUCE-4250 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339002 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-05-16 04:16:37 +00:00
parent 10ff302093
commit e8ea3fdb52
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -183,6 +183,9 @@ Release 2.0.0 - UNRELEASED
MAPREDUCE-4148. MapReduce should not have a compile-time dependency on MAPREDUCE-4148. MapReduce should not have a compile-time dependency on
HDFS. (tomwhite) HDFS. (tomwhite)
MAPREDUCE-4250. hadoop-config.sh missing variable exports, causes Yarn
jobs to fail with ClassNotFoundException MRAppMaster. (phunt via tucu)
Release 0.23.3 - UNRELEASED Release 0.23.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-yarn/bin/yarn-config.sh
View File

@ -49,7 +49,7 @@ then
fi fi
# Allow alternate conf dir location. # Allow alternate conf dir location.
YARN_CONF_DIR="${HADOOP_CONF_DIR:-$YARN_HOME/conf}" export YARN_CONF_DIR="${HADOOP_CONF_DIR:-$YARN_HOME/conf}"
#check to see it is specified whether to use the slaves or the #check to see it is specified whether to use the slaves or the
# masters file # masters file