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 tu...@apache.org on 2011/10/28 23:14:37 UTC
svn commit: r1190581 - in /hadoop/common/branches/branch-0.23: hadoop-tools/
hadoop-tools/pom.xml pom.xml
Author: tucu
Date: Fri Oct 28 21:14:36 2011
New Revision: 1190581
URL: http://svn.apache.org/viewvc?rev=1190581&view=rev
Log:
Merge -r 1179911:1179912 from trunk to branch. FIXES: HADOOP-7624
Added:
hadoop/common/branches/branch-0.23/hadoop-tools/
- copied from r1179912, hadoop/common/trunk/hadoop-tools/
hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml
- copied, changed from r1179912, hadoop/common/trunk/hadoop-tools/pom.xml
Modified:
hadoop/common/branches/branch-0.23/pom.xml
Copied: hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml (from r1179912, hadoop/common/trunk/hadoop-tools/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml?p2=hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml&p1=hadoop/common/trunk/hadoop-tools/pom.xml&r1=1179912&r2=1190581&rev=1190581&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml Fri Oct 28 21:14:36 2011
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.23.0-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-tools-project</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.23.0-SNAPSHOT</version>
<description>Apache Hadoop Tools</description>
<name>Apache Hadoop Tools</name>
<packaging>pom</packaging>
Modified: hadoop/common/branches/branch-0.23/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/pom.xml?rev=1190581&r1=1190580&r2=1190581&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/pom.xml Fri Oct 28 21:14:36 2011
@@ -40,6 +40,7 @@
<module>hadoop-common-project</module>
<module>hadoop-hdfs-project</module>
<module>hadoop-mapreduce-project</module>
+ <module>hadoop-tools</module>
</modules>
<build>