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/12/13 21:29:07 UTC
svn commit: r1213915 - in /hadoop/common/branches/branch-0.23/hadoop-tools: ./ hadoop-archives/ hadoop-archives/src/ hadoop-archives/src/main/ hadoop-archives/src/main/java/ hadoop-archives/src/main/java/org/ hadoop-archives/src/main/java/org/apache/ h...

Author: tucu
Date: Tue Dec 13 20:29:06 2011
New Revision: 1213915

URL: http://svn.apache.org/viewvc?rev=1213915&view=rev
Log:
Merge -r 1213907:1213908 and 1213910:1213911 from trunk to branch. FIXES: HADOOP-7810

Added:
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/pom.xml
      - copied, changed from r1213911, hadoop/common/trunk/hadoop-tools/hadoop-archives/pom.xml
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/main/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/main/java/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/main/java/org/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/org/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/main/java/org/apache/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/org/apache/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java
      - copied unchanged from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/org/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/apache/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/org/apache/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/
      - copied from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
      - copied unchanged from r1213907, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
Modified:
    hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml

Copied: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/pom.xml (from r1213911, hadoop/common/trunk/hadoop-tools/hadoop-archives/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/pom.xml?p2=hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/pom.xml&p1=hadoop/common/trunk/hadoop-tools/hadoop-archives/pom.xml&r1=1213911&r2=1213915&rev=1213915&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-archives/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/pom.xml Tue Dec 13 20:29:06 2011
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.23.1-SNAPSHOT</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-archives</artifactId>
-  <version>0.24.0-SNAPSHOT</version>
+  <version>0.23.1-SNAPSHOT</version>
   <description>Apache Hadoop Archives</description>
   <name>Apache Hadoop Archives</name>
   <packaging>jar</packaging>

Modified: hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml?rev=1213915&r1=1213914&r2=1213915&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml Tue Dec 13 20:29:06 2011
@@ -29,6 +29,7 @@
 
   <modules>
     <module>hadoop-streaming</module>
+    <module>hadoop-archives</module>
   </modules>
 
   <build>