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/02/07 18:55:29 UTC
[1/6] git commit: ACCUMULO-2337 Increase timeout on MetaSplitTest.
Updated Branches:
refs/heads/1.5.1-SNAPSHOT 510140ad0 -> 19e6b1018
refs/heads/1.6.0-SNAPSHOT dea61a07d -> db42aba02
refs/heads/master b94e308e5 -> 39a10c8bc
ACCUMULO-2337 Increase timeout on MetaSplitTest.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19e6b101
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19e6b101
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/19e6b101
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 19e6b101806e5fffdf632e7696b58827eb2e26cf
Parents: 510140a
Author: Josh Elser <el...@apache.org>
Authored: Fri Feb 7 12:53:34 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Feb 7 12:53:34 2014 -0500
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/19e6b101/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java b/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
index 403d591..aa7c17e 100644
--- a/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
@@ -64,7 +64,7 @@ public class MetaSplitTest {
opts.addSplits(Constants.METADATA_TABLE_NAME, splits);
}
- @Test(timeout = 60000)
+ @Test(timeout = 120000)
public void testMetaSplit() throws Exception {
Instance instance = new ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
Connector connector = instance.getConnector("root", new PasswordToken(secret));
[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db42aba0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db42aba0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/db42aba0
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: db42aba0215e5698b82bce057d4027dda586b9d5
Parents: dea61a0 19e6b10
Author: Josh Elser <el...@apache.org>
Authored: Fri Feb 7 12:54:44 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Feb 7 12:54:44 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: ACCUMULO-2337 Increase timeout on MetaSplitTest.
Posted by el...@apache.org.
ACCUMULO-2337 Increase timeout on MetaSplitTest.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19e6b101
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19e6b101
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/19e6b101
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 19e6b101806e5fffdf632e7696b58827eb2e26cf
Parents: 510140a
Author: Josh Elser <el...@apache.org>
Authored: Fri Feb 7 12:53:34 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Feb 7 12:53:34 2014 -0500
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/19e6b101/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java b/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
index 403d591..aa7c17e 100644
--- a/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
@@ -64,7 +64,7 @@ public class MetaSplitTest {
opts.addSplits(Constants.METADATA_TABLE_NAME, splits);
}
- @Test(timeout = 60000)
+ @Test(timeout = 120000)
public void testMetaSplit() throws Exception {
Instance instance = new ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
Connector connector = instance.getConnector("root", new PasswordToken(secret));
[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db42aba0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db42aba0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/db42aba0
Branch: refs/heads/master
Commit: db42aba0215e5698b82bce057d4027dda586b9d5
Parents: dea61a0 19e6b10
Author: Josh Elser <el...@apache.org>
Authored: Fri Feb 7 12:54:44 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Feb 7 12:54:44 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/6] 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/39a10c8b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/39a10c8b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/39a10c8b
Branch: refs/heads/master
Commit: 39a10c8bca9defaed2c22f6217e1aaee9ffb0aa1
Parents: b94e308 db42aba
Author: Josh Elser <el...@apache.org>
Authored: Fri Feb 7 12:54:55 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Feb 7 12:54:55 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] git commit: ACCUMULO-2337 Increase timeout on MetaSplitTest.
Posted by el...@apache.org.
ACCUMULO-2337 Increase timeout on MetaSplitTest.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19e6b101
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19e6b101
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/19e6b101
Branch: refs/heads/master
Commit: 19e6b101806e5fffdf632e7696b58827eb2e26cf
Parents: 510140a
Author: Josh Elser <el...@apache.org>
Authored: Fri Feb 7 12:53:34 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Feb 7 12:53:34 2014 -0500
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/19e6b101/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java b/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
index 403d591..aa7c17e 100644
--- a/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
@@ -64,7 +64,7 @@ public class MetaSplitTest {
opts.addSplits(Constants.METADATA_TABLE_NAME, splits);
}
- @Test(timeout = 60000)
+ @Test(timeout = 120000)
public void testMetaSplit() throws Exception {
Instance instance = new ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
Connector connector = instance.getConnector("root", new PasswordToken(secret));