Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 7EFA9B20E for ; Sat, 31 Dec 2011 15:36:38 +0000 (UTC) Received: (qmail 42394 invoked by uid 500); 31 Dec 2011 15:36:38 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 42355 invoked by uid 500); 31 Dec 2011 15:36:38 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 42348 invoked by uid 99); 31 Dec 2011 15:36:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Dec 2011 15:36:38 +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; Sat, 31 Dec 2011 15:36:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DEFAA23889D7 for ; Sat, 31 Dec 2011 15:36:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1226103 - in /hbase/trunk: CHANGES.txt src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java Date: Sat, 31 Dec 2011 15:36:14 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111231153614.DEFAA23889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tedyu Date: Sat Dec 31 15:36:14 2011 New Revision: 1226103 URL: http://svn.apache.org/viewvc?rev=1226103&view=rev Log: HBASE-5105 TestImportTsv failed with hadoop 0.22 (Ming Ma) Modified: hbase/trunk/CHANGES.txt hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java Modified: hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1226103&r1=1226102&r2=1226103&view=diff ============================================================================== --- hbase/trunk/CHANGES.txt (original) +++ hbase/trunk/CHANGES.txt Sat Dec 31 15:36:14 2011 @@ -486,6 +486,7 @@ Release 0.92.0 - Unreleased uninitialized Scan (Jimmy Xiang) HBASE-5113 TestDrainingServer expects round robin region assignment but misses a config parameter + HBASE-5105 TestImportTsv failed with hadoop 0.22 (Ming Ma) IMPROVEMENTS HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack) Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java?rev=1226103&r1=1226102&r2=1226103&view=diff ============================================================================== --- hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java (original) +++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java Sat Dec 31 15:36:14 2011 @@ -186,8 +186,9 @@ public class TestImportTsv { HBaseTestingUtility htu1 = new HBaseTestingUtility(); MiniHBaseCluster cluster = htu1.startMiniCluster(); + htu1.startMiniMapReduceCluster(); - GenericOptionsParser opts = new GenericOptionsParser(cluster.getConfiguration(), args); + GenericOptionsParser opts = new GenericOptionsParser(htu1.getConfiguration(), args); Configuration conf = opts.getConfiguration(); args = opts.getRemainingArgs();