Merge branch 'master' into CURATOR-3.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/7d44baee Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7d44baee Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/7d44baee Branch: refs/heads/master Commit: 7d44baee3d87890b67fc4900f204bb5111368079 Parents: 87a145c 1571588 Author: randgalt <randg...@apache.org> Authored: Thu Mar 9 14:28:15 2017 -0800 Committer: randgalt <randg...@apache.org> Committed: Thu Mar 9 14:28:15 2017 -0800 ---------------------------------------------------------------------- .../framework/recipes/nodes/PersistentNode.java | 9 +++- .../nodes/TestPersistentEphemeralNode.java | 52 +++++++++++++++++++- 2 files changed, 58 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/7d44baee/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/7d44baee/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java ---------------------------------------------------------------------- diff --cc curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java index 15c5f2e,ef8a45a..7d52b58 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java @@@ -23,9 -22,9 +23,10 @@@ import com.google.common.collect.Immuta import com.google.common.collect.Lists; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; + import org.apache.curator.framework.api.ACLProvider; import org.apache.curator.framework.api.BackgroundCallback; import org.apache.curator.framework.api.CuratorEvent; +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.RetryOneTime; @@@ -49,8 -46,8 +50,9 @@@ import org.testng.annotations.Test import java.io.IOException; import java.util.Arrays; import java.util.Collection; + import java.util.Collections; import java.util.List; +import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit;
