Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 85873646D for ; Wed, 22 Jun 2011 02:02:48 +0000 (UTC) Received: (qmail 22638 invoked by uid 500); 22 Jun 2011 02:02:48 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 22614 invoked by uid 500); 22 Jun 2011 02:02:48 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 22607 invoked by uid 99); 22 Jun 2011 02:02:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jun 2011 02:02:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jun 2011 02:02:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E40823889EA; Wed, 22 Jun 2011 02:02:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1138278 - in /hadoop/common/branches/MR-279/common: CHANGES.txt src/saveVersion.sh Date: Wed, 22 Jun 2011 02:02:24 -0000 To: common-commits@hadoop.apache.org From: llu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110622020225.0E40823889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: llu Date: Wed Jun 22 02:02:24 2011 New Revision: 1138278 URL: http://svn.apache.org/viewvc?rev=1138278&view=rev Log: HADOOP-7390. VersionInfo not generated properly in git after unsplit. (todd via atm) Modified: hadoop/common/branches/MR-279/common/CHANGES.txt hadoop/common/branches/MR-279/common/src/saveVersion.sh Modified: hadoop/common/branches/MR-279/common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/common/CHANGES.txt?rev=1138278&r1=1138277&r2=1138278&view=diff ============================================================================== --- hadoop/common/branches/MR-279/common/CHANGES.txt (original) +++ hadoop/common/branches/MR-279/common/CHANGES.txt Wed Jun 22 02:02:24 2011 @@ -142,6 +142,9 @@ Trunk (unreleased changes) HADOOP-7082. Configuration.writeXML should not hold lock while outputting. (todd) + HADOOP-7390. VersionInfo not generated properly in git after unsplit. (todd + via atm) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/branches/MR-279/common/src/saveVersion.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/common/src/saveVersion.sh?rev=1138278&r1=1138277&r2=1138278&view=diff ============================================================================== --- hadoop/common/branches/MR-279/common/src/saveVersion.sh (original) +++ hadoop/common/branches/MR-279/common/src/saveVersion.sh Wed Jun 22 02:02:24 2011 @@ -26,7 +26,7 @@ build_dir=$2 user=`whoami` date=`date` cwd=`pwd` -if [ -d .git ]; then +if git rev-parse HEAD 2>/dev/null > /dev/null ; then revision=`git log -1 --pretty=format:"%H"` hostname=`hostname` branch=`git branch | sed -n -e 's/^* //p'`