svn commit: r1299412 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn: hadoop-yarn-common/scripts/saveVersion.sh hadoop-yarn-site/src/site/apt/HDFSHighAvailability.apt.vm

[su...@apache.org]

Author: suresh
Date: Sun Mar 11 17:55:58 2012
New Revision: 1299412

URL: http://svn.apache.org/viewvc?rev=1299412&view=rev
Log:
HDFS-1623. Merging change r1296534 from trunk to 0.23

Added:
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HDFSHighAvailability.apt.vm
      - copied unchanged from r1296534, hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HDFSHighAvailability.apt.vm
Modified:
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/scripts/saveVersion.sh

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/scripts/saveVersion.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/scripts/saveVersion.sh?rev=1299412&r1=1299411&r2=1299412&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/scripts/saveVersion.sh (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/scripts/saveVersion.sh Sun Mar 11 17:55:58 2012
@@ -34,7 +34,7 @@ if git rev-parse HEAD 2>/dev/null > /dev
   url="git://${hostname}${cwd}"
 elif [ -d .svn ]; then
   revision=`svn info ../ | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
-  url=`svn info ../ | sed -n -e 's/URL: \(.*\)/\1/p'`
+  url=`svn info ../ | sed -n -e 's/^URL: \(.*\)/\1/p'`
   # Get canonical branch (branches/X, tags/X, or trunk)
   branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \
                              -e 's,.*\(tags/.*\)$,\1,p' \