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/18 16:46:34 UTC
[1/2] git commit: ACCUMULO-2492 add time for zookeeper propogation
Repository: accumulo
Updated Branches:
refs/heads/master d1543a4e5 -> 05e2b12a8
ACCUMULO-2492 add time for zookeeper propogation
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d32c522
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d32c522
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d32c522
Branch: refs/heads/master
Commit: 7d32c5229219fafe60699dea88ea04544f51d61d
Parents: c3837f4
Author: Eric Newton <er...@gmail.com>
Authored: Tue Mar 18 11:44:26 2014 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Mar 18 11:44:45 2014 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/NamespacesIT.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d32c522/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
index af9274b..a2be168 100644
--- a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
@@ -313,6 +313,7 @@ public class NamespacesIT extends SimpleMacIT {
// verify entry is filtered out (also, verify conflict checking API)
c.namespaceOperations().checkIteratorConflicts(namespace, setting, EnumSet.allOf(IteratorScope.class));
c.namespaceOperations().attachIterator(namespace, setting);
+ UtilWaitThread.sleep(2*1000);
try {
c.namespaceOperations().checkIteratorConflicts(namespace, setting, EnumSet.allOf(IteratorScope.class));
fail();
@@ -328,6 +329,7 @@ public class NamespacesIT extends SimpleMacIT {
// verify can see inserted entry again
c.namespaceOperations().removeIterator(namespace, setting.getName(), EnumSet.allOf(IteratorScope.class));
+ UtilWaitThread.sleep(2*1000);
assertFalse(c.namespaceOperations().listIterators(namespace).containsKey(iterName));
assertFalse(c.tableOperations().listIterators(t1).containsKey(iterName));
s = c.createScanner(t1, Authorizations.EMPTY);
[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/05e2b12a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/05e2b12a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/05e2b12a
Branch: refs/heads/master
Commit: 05e2b12a808ec1a6f94cd9b5eec8a0ea064f6400
Parents: d1543a4 7d32c52
Author: Eric Newton <er...@gmail.com>
Authored: Tue Mar 18 11:45:09 2014 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Mar 18 11:45:09 2014 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/NamespacesIT.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------