You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/03/28 17:59:50 UTC
[1/2] git commit: ACCUMULO-2455 1s timeout is too tight for testing
Repository: accumulo
Updated Branches:
refs/heads/master 5655a044e -> 277da3f83
ACCUMULO-2455 1s timeout is too tight for testing
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e5070d0a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e5070d0a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e5070d0a
Branch: refs/heads/master
Commit: e5070d0ad084f218d283b9daa58246184afdb477
Parents: a20e19f
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Mar 28 12:58:19 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Mar 28 12:58:34 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/functional/WriteAheadLogIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e5070d0a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
index ad18b65..1c31c2f 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
@@ -45,7 +45,7 @@ public class WriteAheadLogIT extends ConfigurableMacIT {
siteConfig.put(Property.GC_CYCLE_START.getKey(), "1");
siteConfig.put(Property.MASTER_RECOVERY_DELAY.getKey(), "1s");
siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "1");
- siteConfig.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "1s");
+ siteConfig.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "4s");
cfg.setSiteConfig(siteConfig);
cfg.useMiniDFS(true);
}
[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/277da3f8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/277da3f8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/277da3f8
Branch: refs/heads/master
Commit: 277da3f83a30938bd839e36563a21672591bc1d1
Parents: 5655a04 e5070d0
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Mar 28 12:59:09 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Mar 28 12:59:09 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/functional/WriteAheadLogIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------