You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ca...@apache.org on 2016/06/15 02:11:11 UTC
[06/19] curator git commit: Merge branch 'master' into CURATOR-3.0
Merge branch 'master' into CURATOR-3.0
Conflicts:
curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d94a54f7
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d94a54f7
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d94a54f7
Branch: refs/heads/CURATOR-3.0
Commit: d94a54f7814b4de90c95867a3495c0755ef3646c
Parents: 31a8241 6476773
Author: Cam McKenzie <ca...@apache.org>
Authored: Wed Jun 15 08:41:29 2016 +1000
Committer: Cam McKenzie <ca...@apache.org>
Committed: Wed Jun 15 08:41:29 2016 +1000
----------------------------------------------------------------------
.../framework/recipes/cache/TreeCache.java | 2 +-
.../framework/recipes/cache/TestTreeCache.java | 51 ++++++++++++++++++--
2 files changed, 48 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/d94a54f7/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/d94a54f7/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
----------------------------------------------------------------------
diff --cc curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index b10df68,2d0ae83..62cf586
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@@ -21,8 -21,9 +21,9 @@@ package org.apache.curator.framework.re
import com.google.common.collect.ImmutableSet;
import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.test.KillServerSession;
- import org.apache.curator.test.KillSession;
+ import org.apache.curator.framework.api.UnhandledErrorListener;
+ import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
-import org.apache.curator.test.KillSession;
import org.apache.curator.utils.CloseableUtils;
import org.apache.zookeeper.CreateMode;
import org.testng.Assert;