You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/04/29 03:40:05 UTC
[1/3] git commit: ACCUMULO-2680 Extend the timeout even more
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT d2caaa2d6 -> 0aa475895
refs/heads/master 041761ca6 -> a723216a7
ACCUMULO-2680 Extend the timeout even more
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0aa47589
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0aa47589
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0aa47589
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0aa4758955ca8386a132e08060208c3b1bd9e983
Parents: d2caaa2
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 28 21:37:40 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 28 21:38:11 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/functional/BackupMasterIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0aa47589/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
index 69c5195..bf2d2e1 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
@@ -29,7 +29,7 @@ public class BackupMasterIT extends ConfigurableMacIT {
@Override
protected int defaultTimeoutSeconds() {
- return 20;
+ return 120;
}
@Test
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by el...@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/a723216a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a723216a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a723216a
Branch: refs/heads/master
Commit: a723216a7fa649140eb643536ff57a9cf76db70d
Parents: 041761c 0aa4758
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 28 21:38:43 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 28 21:38:43 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/functional/BackupMasterIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-2680 Extend the timeout even more
Posted by el...@apache.org.
ACCUMULO-2680 Extend the timeout even more
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0aa47589
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0aa47589
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0aa47589
Branch: refs/heads/master
Commit: 0aa4758955ca8386a132e08060208c3b1bd9e983
Parents: d2caaa2
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 28 21:37:40 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 28 21:38:11 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/functional/BackupMasterIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0aa47589/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
index 69c5195..bf2d2e1 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
@@ -29,7 +29,7 @@ public class BackupMasterIT extends ConfigurableMacIT {
@Override
protected int defaultTimeoutSeconds() {
- return 20;
+ return 120;
}
@Test