Author: tgraves
Date: Tue May 15 19:15:43 2012
New Revision: 1338841
URL: http://svn.apache.org/viewvc?rev=1338841&view=rev
Log:
merge -r 1338834:1338835 from trunk. FIXES: MAPREDUCE-4238
Added:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/
- copied from r1338835, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml
- copied, changed from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/README.txt
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/README.txt
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/
- copied from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java
- copied unchanged from r1338835,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java
Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1338841&r1=1338840&r2=1338841&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Tue May 15 19:15:43
2012
@@ -233,6 +233,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>
Copied: hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml
(from r1338835, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml)
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml?p2=hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml&p1=hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml&r1=1338835&r2=1338841&rev=1338841&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml Tue
May 15 19:15:43 2012
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-datajoin</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<description>Apache Hadoop Data Join</description>
<name>Apache Hadoop Data Join</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1338841&r1=1338840&r2=1338841&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml Tue
May 15 19:15:43 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/branch-2/hadoop-tools/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/pom.xml?rev=1338841&r1=1338840&r2=1338841&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/pom.xml Tue May 15 19:15:43
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>
