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/04/25 17:29:42 UTC
[1/4] git commit: ACCUMULO-2569 allow for iterator settings to
propogate everywhere before testing
Repository: accumulo
Updated Branches:
refs/heads/master e10d1a7a5 -> 6c941e130
ACCUMULO-2569 allow for iterator settings to propogate everywhere before testing
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0309df84
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0309df84
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0309df84
Branch: refs/heads/master
Commit: 0309df847368232fe178c91a54d3b3630a5f13d0
Parents: 0b79ee8
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Apr 25 11:26:43 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Apr 25 11:26:43 2014 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/test/functional/ExamplesIT.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0309df84/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 856f663..b400fcb 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -197,12 +197,13 @@ public class ExamplesIT extends AbstractMacIT {
assertTrue(result.contains("accumulo-site.xml"));
}
- @Test(timeout = 5 * 1000)
+ @Test(timeout = 6 * 1000)
public void testAgeoffFilter() throws Exception {
c.tableOperations().create("filtertest");
is = new IteratorSetting(10, AgeOffFilter.class);
AgeOffFilter.setTTL(is, 1000L);
c.tableOperations().attachIterator("filtertest", is);
+ UtilWaitThread.sleep(500); // let zookeeper updates propagate.
bw = c.createBatchWriter("filtertest", bwc);
Mutation m = new Mutation("foo");
m.put("a", "b", "c");
[4/4] 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/6c941e13
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c941e13
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c941e13
Branch: refs/heads/master
Commit: 6c941e13048094062b7dcffe1cc4bccd73f8e80e
Parents: 858288b 90377b6
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Apr 25 11:29:45 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Apr 25 11:29:45 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/4] 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/858288ba
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/858288ba
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/858288ba
Branch: refs/heads/master
Commit: 858288ba90d32033daa823c186110b16ae1336e2
Parents: e10d1a7 0309df8
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Apr 25 11:27:45 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Apr 25 11:27:45 2014 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/test/functional/ExamplesIT.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/4] git commit: ACCUMULO-2569 allow for iterator settings to
propogate everywhere before testing
Posted by ec...@apache.org.
ACCUMULO-2569 allow for iterator settings to propogate everywhere before testing
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90377b6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90377b6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90377b6b
Branch: refs/heads/master
Commit: 90377b6b8937097d98dc93ba1fdcce465150ff75
Parents: fac91d3
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Apr 25 11:26:43 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Apr 25 11:29:13 2014 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/test/functional/ExamplesIT.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/90377b6b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 856f663..b400fcb 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -197,12 +197,13 @@ public class ExamplesIT extends AbstractMacIT {
assertTrue(result.contains("accumulo-site.xml"));
}
- @Test(timeout = 5 * 1000)
+ @Test(timeout = 6 * 1000)
public void testAgeoffFilter() throws Exception {
c.tableOperations().create("filtertest");
is = new IteratorSetting(10, AgeOffFilter.class);
AgeOffFilter.setTTL(is, 1000L);
c.tableOperations().attachIterator("filtertest", is);
+ UtilWaitThread.sleep(500); // let zookeeper updates propagate.
bw = c.createBatchWriter("filtertest", bwc);
Mutation m = new Mutation("foo");
m.put("a", "b", "c");