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

Merge -r 1177873:1177874 from trunk to branch-0.23 to fix MAPREDUCE-3113.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177875 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-10-01 00:00:04 +00:00
parent d2bf75aec0
commit 714d8fbeb2
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1461,6 +1461,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3050. Add ability to get resource usage information for MAPREDUCE-3050. Add ability to get resource usage information for
applications and nodes. (Robert Evans via acmurthy) applications and nodes. (Robert Evans via acmurthy)
MAPREDUCE-3113. Ensure bin/yarn and bin/yarn-daemon.sh identify the root
of the install properly. (Xie Xianshan via acmurthy)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-yarn/bin/yarn
View File

@ -47,7 +47,7 @@
# YARN_ROOT_LOGGER The root appender. Default is INFO,console # YARN_ROOT_LOGGER The root appender. Default is INFO,console
# #
bin=`dirname "$0"` bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd` bin=`cd "$bin"; pwd`
. "$bin"/yarn-config.sh . "$bin"/yarn-config.sh

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

@ -36,7 +36,7 @@ if [ $# -le 1 ]; then
exit 1 exit 1
fi fi
bin=`dirname "$0"` bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd` bin=`cd "$bin"; pwd`
. "$bin"/yarn-config.sh . "$bin"/yarn-config.sh