Return-Path: 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 2336E9CE3 for ; Tue, 19 Jun 2012 21:54:34 +0000 (UTC) Received: (qmail 24409 invoked by uid 500); 19 Jun 2012 21:54:33 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 24347 invoked by uid 500); 19 Jun 2012 21:54:33 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 24340 invoked by uid 99); 19 Jun 2012 21:54:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2012 21:54:33 +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, 19 Jun 2012 21:54:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BBD6523889E0 for ; Tue, 19 Jun 2012 21:54:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1351871 - in /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-datajoin/src/test/java: ./ org/apache/hadoop/contrib/utils/join/ Date: Tue, 19 Jun 2012 21:54:10 -0000 To: common-commits@hadoop.apache.org From: sseth@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120619215410.BBD6523889E0@eris.apache.org> Author: sseth Date: Tue Jun 19 21:54:10 2012 New Revision: 1351871 URL: http://svn.apache.org/viewvc?rev=1351871&view=rev Log: Merge MAPREDUCE-4270 from trunk. Move the data_join test classes to the correct path. (Contributed by Thomas Graves) Added: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/README.txt - copied unchanged from r1351869, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/README.txt hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java - copied unchanged from r1351869, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java - copied unchanged from r1351869, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java - copied unchanged from r1351869, hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java Removed: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-datajoin/src/test/java/README.txt hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java