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:24 UTC
[19/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/TestPathChildrenCache.java
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/37d2b2b0
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/37d2b2b0
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/37d2b2b0
Branch: refs/heads/CURATOR-3.0
Commit: 37d2b2b0e1e22d9ab674ecba2a223ff6fcaa825f
Parents: d828dc0 1f411fc
Author: Cam McKenzie <ca...@apache.org>
Authored: Wed Jun 15 12:10:44 2016 +1000
Committer: Cam McKenzie <ca...@apache.org>
Committed: Wed Jun 15 12:10:44 2016 +1000
----------------------------------------------------------------------
.../recipes/cache/TestPathChildrenCache.java | 21 +++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/37d2b2b0/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
----------------------------------------------------------------------
diff --cc curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
index 49cbb4c,bf998ea..a09c878
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
@@@ -23,7 -23,9 +23,9 @@@ import com.google.common.collect.Lists
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.api.UnhandledErrorListener;
+import org.apache.curator.framework.imps.TestCleanState;
+ import org.apache.curator.framework.state.ConnectionState;
+ import org.apache.curator.framework.state.ConnectionStateListener;
-import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.curator.retry.RetryOneTime;
import org.apache.curator.test.BaseClassForTests;
import org.apache.curator.test.ExecuteCalledWatchingExecutorService;