Return-Path: 
 <commits-return-6205-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-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 EA02410FDB
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Wed, 20 Nov 2013 05:40:00 +0000 (UTC)
Received: (qmail 82753 invoked by uid 500); 20 Nov 2013 05:39:49 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 82549 invoked by uid 500); 20 Nov 2013 05:39:47 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 82497 invoked by uid 99); 20 Nov 2013 05:39:44 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Nov 2013 05:39:44 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 9FFA7884578; Wed, 20 Nov 2013 05:39:44 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: elserj@apache.org
To: commits@accumulo.apache.org
Date: Wed, 20 Nov 2013 05:39:48 -0000
Message-Id: <91f46970b04148f9aefb7b01c97b6e96@git.apache.org>
In-Reply-To: <627250fd1c9d4092be7ed21099bacd08@git.apache.org>
References: <627250fd1c9d4092be7ed21099bacd08@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [5/7] git commit: ACCUMULO-1215 Backport change to stop running test
 from 1.5 to 1.4

ACCUMULO-1215 Backport change to stop running test from 1.5 to 1.4


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3f633bf4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3f633bf4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3f633bf4

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3f633bf45e9f5c0101560ca198fc9eea161e4f27
Parents: ae0be1f
Author: Josh Elser <elserj@apache.org>
Authored: Tue Nov 19 23:52:35 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Nov 19 23:52:35 2013 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/server/tabletserver/InMemoryMapTest.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3f633bf4/src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
----------------------------------------------------------------------
diff --git a/src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java b/src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
index 18e3b9b..95907f0 100644
--- a/src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
+++ b/src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
@@ -42,7 +42,6 @@ import org.apache.hadoop.io.Text;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.junit.Before;
-import org.junit.Test;
 
 public class InMemoryMapTest extends TestCase {
   
@@ -275,7 +274,7 @@ public class InMemoryMapTest extends TestCase {
   }
   
   // @Test - hard to get this timing test to run well on apache build machines
-  public void testParallelWriteSpeed() throws InterruptedException {
+  public void parallelWriteSpeed() throws InterruptedException {
     List<Double> timings = new ArrayList<Double>();
     for (int threads: new int[]{1, 2, 16, 64, 256} ) {
       final long now = System.currentTimeMillis();