Return-Path: 
 <common-commits-return-16026-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
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 29AA79785
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Fri, 18 Nov 2011 18:29:54 +0000 (UTC)
Received: (qmail 20525 invoked by uid 500); 18 Nov 2011 18:29:53 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 20482 invoked by uid 500); 18 Nov 2011 18:29:53 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 20475 invoked by uid 99); 18 Nov 2011 18:29:53 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Nov 2011 18:29:53 +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; Fri, 18 Nov 2011 18:29:50 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id BB57E238897A
	for <common-commits@hadoop.apache.org>; Fri, 18 Nov 2011 18:29:29 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1203781 - in /hadoop/common/branches/HDFS-1623: ./
 pom.xml
Date: Fri, 18 Nov 2011 18:29:29 -0000
To: common-commits@hadoop.apache.org
From: atm@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111118182929.BB57E238897A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: atm
Date: Fri Nov 18 18:29:26 2011
New Revision: 1203781

URL: http://svn.apache.org/viewvc?rev=1203781&view=rev
Log:
Merge trunk into HA branch.

Modified:
    hadoop/common/branches/HDFS-1623/   (props changed)
    hadoop/common/branches/HDFS-1623/pom.xml

Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 18:29:26 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1203318
+/hadoop/common/trunk:1152502-1203779

Modified: hadoop/common/branches/HDFS-1623/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/pom.xml?rev=1203781&r1=1203780&r2=1203781&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/pom.xml Fri Nov 18 18:29:26 2011
@@ -264,7 +264,7 @@
                 <configuration>
                   <appendAssemblyId>false</appendAssemblyId>
                   <attach>false</attach>
-                  <finalName>hadoop-dist-${project.version}-src</finalName>
+                  <finalName>hadoop-${project.version}-src</finalName>
                   <outputDirectory>hadoop-dist/target</outputDirectory>
                   <!-- Not using descriptorRef and hadoop-assembly dependency -->
                   <!-- to avoid making hadoop-main to depend on a module      -->
@@ -288,7 +288,7 @@
                 <configuration>
                   <target>
                     <echo/>
-                    <echo>Hadoop source tar available at: ${basedir}/hadoop-dist/target/hadoop-dist-${project.version}-src.tar.gz</echo>
+                    <echo>Hadoop source tar available at: ${basedir}/hadoop-dist/target/hadoop-${project.version}-src.tar.gz</echo>
                     <echo/>
                   </target>
                 </configuration>