accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [4/9] git commit: ACCUMULO-3074 Increase the timeout for MergeIT#mergeTest
Date Thu, 21 Aug 2014 22:27:12 GMT
ACCUMULO-3074 Increase the timeout for MergeIT#mergeTest


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

Branch: refs/heads/master
Commit: 6df579984697e5022b94b3490c667cd012d6be05
Parents: 0088326
Author: Josh Elser <elserj@apache.org>
Authored: Thu Aug 21 17:42:03 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Aug 21 17:42:03 2014 -0400

----------------------------------------------------------------------
 .../src/test/java/org/apache/accumulo/test/functional/MergeIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6df57998/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
index 80ea6b2..62cb141 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
@@ -99,7 +99,7 @@ public class MergeIT extends SimpleMacIT {
     return strings;
   }
 
-  @Test(timeout = 4 * 60 * 1000)
+  @Test(timeout = 8 * 60 * 1000)
   public void mergeTest() throws Exception {
     int tc = 0;
     Connector c = getConnector();


Mime
View raw message