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:
parent
10ff302093
commit
e8ea3fdb52
|
@ -183,6 +183,9 @@ Release 2.0.0 - UNRELEASED
|
|||
MAPREDUCE-4148. MapReduce should not have a compile-time dependency on
|
||||
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
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -49,7 +49,7 @@ then
|
|||
fi
|
||||
|
||||
# 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
|
||||
# masters file
|
||||
|
|
Loading…
Reference in New Issue