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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177875 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -1461,6 +1461,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3050. Add ability to get resource usage information for
     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
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-yarn/bin/yarn

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

hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh

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