hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1214546 - in /hadoop/common/branches/HDFS-1623: ./ hadoop-project/ hadoop-tools/ hadoop-tools/hadoop-archives/ hadoop-tools/hadoop-archives/src/ hadoop-tools/hadoop-archives/src/main/ hadoop-tools/hadoop-archives/src/main/java/ hadoop-tool...
Date Wed, 14 Dec 2011 23:34:10 GMT
Author: todd
Date: Wed Dec 14 23:34:04 2011
New Revision: 1214546

URL: http://svn.apache.org/viewvc?rev=1214546&view=rev
Log:
Committing rest of merge from trunk (accidentally only committed the HDFS portion before)

Added:
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/pom.xml
      - copied unchanged from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/pom.xml
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/main/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/main/java/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/main/java/org/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/org/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/main/java/org/apache/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/org/apache/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java
      - copied unchanged from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/test/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/test/java/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/test/java/org/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/org/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/test/java/org/apache/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/org/apache/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/
      - copied from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
      - copied unchanged from r1214510, hadoop/common/trunk/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
Modified:
    hadoop/common/branches/HDFS-1623/   (props changed)
    hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
    hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml

Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 23:34:04 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1213862
+/hadoop/common/trunk:1152502-1214510

Modified: hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml?rev=1214546&r1=1214545&r2=1214546&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Wed Dec 14 23:34:04 2011
@@ -403,11 +403,6 @@
         <version>1.5.3</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.avro</groupId>
-        <artifactId>avro-ipc</artifactId>
-        <version>1.5.3</version>
-      </dependency>
-      <dependency>
         <groupId>net.sf.kosmosfs</groupId>
         <artifactId>kfs</artifactId>
         <version>0.3</version>

Modified: hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml?rev=1214546&r1=1214545&r2=1214546&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml Wed Dec 14 23:34:04 2011
@@ -29,6 +29,7 @@
 
   <modules>
     <module>hadoop-streaming</module>
+    <module>hadoop-archives</module>
   </modules>
 
   <build>



Mime
View raw message