Return-Path: 
 <common-commits-return-17954-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 17A3ECA70
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Tue, 15 May 2012 19:16:11 +0000 (UTC)
Received: (qmail 40327 invoked by uid 500); 15 May 2012 19:16:10 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 40251 invoked by uid 500); 15 May 2012 19:16:10 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 40243 invoked by uid 99); 15 May 2012 19:16:10 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 May 2012 19:16:10 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 May 2012 19:16:06 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8B6902388A32
	for <common-commits@hadoop.apache.org>; Tue, 15 May 2012 19:15:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1338841 - in /hadoop/common/branches/branch-2:
 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-tools/ha...
Date: Tue, 15 May 2012 19:15:45 -0000
To: common-commits@hadoop.apache.org
From: tgraves@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120515191545.8B6902388A32@eris.apache.org>

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>