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/09/10 04:04:04 UTC

[1/3] git commit: ACCUMULO-3104 Set a very loose timeout for AccumuloInputFormatIT

Repository: accumulo
Updated Branches:
  refs/heads/1.6.1-SNAPSHOT ae01d35bc -> 5be05eb7f
  refs/heads/master 3296dab1b -> 72f09f7c5


ACCUMULO-3104 Set a very loose timeout for AccumuloInputFormatIT


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 5be05eb7fccfb5e3d102ed08d962138e54573f3b
Parents: ae01d35
Author: Josh Elser <el...@apache.org>
Authored: Tue Sep 9 18:52:44 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Tue Sep 9 18:59:25 2014 -0700

----------------------------------------------------------------------
 .../apache/accumulo/test/functional/AccumuloInputFormatIT.java  | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5be05eb7/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
index 150222f..b6b1086 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
@@ -49,6 +49,11 @@ public class AccumuloInputFormatIT extends SimpleMacIT {
 
   AccumuloInputFormat inputFormat;
 
+  @Override
+  protected int defaultTimeoutSeconds() {
+    return 4 * 60;
+  }
+
   @Before
   public void before() {
     inputFormat = new AccumuloInputFormat();


[2/3] git commit: ACCUMULO-3104 Set a very loose timeout for AccumuloInputFormatIT

Posted by el...@apache.org.
ACCUMULO-3104 Set a very loose timeout for AccumuloInputFormatIT


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

Branch: refs/heads/master
Commit: 5be05eb7fccfb5e3d102ed08d962138e54573f3b
Parents: ae01d35
Author: Josh Elser <el...@apache.org>
Authored: Tue Sep 9 18:52:44 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Tue Sep 9 18:59:25 2014 -0700

----------------------------------------------------------------------
 .../apache/accumulo/test/functional/AccumuloInputFormatIT.java  | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5be05eb7/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
index 150222f..b6b1086 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
@@ -49,6 +49,11 @@ public class AccumuloInputFormatIT extends SimpleMacIT {
 
   AccumuloInputFormat inputFormat;
 
+  @Override
+  protected int defaultTimeoutSeconds() {
+    return 4 * 60;
+  }
+
   @Before
   public void before() {
     inputFormat = new AccumuloInputFormat();


[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'

Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 72f09f7c5e22a30b0cff6e2a7de8e23ffa4db55f
Parents: 3296dab 5be05eb
Author: Josh Elser <el...@apache.org>
Authored: Tue Sep 9 18:59:40 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Tue Sep 9 18:59:40 2014 -0700

----------------------------------------------------------------------
 .../apache/accumulo/test/functional/AccumuloInputFormatIT.java  | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/72f09f7c/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------