You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by at...@apache.org on 2011/11/18 19:29:29 UTC
svn commit: r1203781 - in /hadoop/common/branches/HDFS-1623: ./ pom.xml
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>