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 to...@apache.org on 2012/05/17 00:47:41 UTC
svn commit: r1339410 - in /hadoop/common/branches/HDFS-3042: ./
hadoop-project/ hadoop-tools/ hadoop-tools/hadoop-datajoin/
hadoop-tools/hadoop-datajoin/src/ hadoop-tools/hadoop-datajoin/src/main/
hadoop-tools/hadoop-datajoin/src/main/java/ hadoop-tool...
Author: todd
Date: Wed May 16 22:47:37 2012
New Revision: 1339410
URL: http://svn.apache.org/viewvc?rev=1339410&view=rev
Log:
Merge trunk into auto-HA branch
Added:
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/pom.xml
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/README.txt
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/README.txt
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/org/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/
- copied from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java
- copied unchanged from r1339407, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java
Modified:
hadoop/common/branches/HDFS-3042/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml
Propchange: hadoop/common/branches/HDFS-3042/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1337619-1339407
Modified: hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml?rev=1339410&r1=1339409&r2=1339410&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml Wed May 16 22:47:37 2012
@@ -230,6 +230,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-datajoin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-rumen</artifactId>
<version>${project.version}</version>
</dependency>
Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1339410&r1=1339409&r2=1339410&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml Wed May 16 22:47:37 2012
@@ -54,6 +54,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-datajoin</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-extras</artifactId>
<scope>compile</scope>
</dependency>
Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml?rev=1339410&r1=1339409&r2=1339410&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml Wed May 16 22:47:37 2012
@@ -32,6 +32,7 @@
<module>hadoop-distcp</module>
<module>hadoop-archives</module>
<module>hadoop-rumen</module>
+ <module>hadoop-datajoin</module>
<module>hadoop-tools-dist</module>
<module>hadoop-extras</module>
</modules>