curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [4/4] curator git commit: Merge branch 'master' into CURATOR-3.0
Date Sun, 11 Oct 2015 20:51:19 GMT
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/9a9e18e2
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/9a9e18e2
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/9a9e18e2

Branch: refs/heads/CURATOR-3.0
Commit: 9a9e18e24f9ef7067c455c3a1b950544b0f88a26
Parents: 2fa711c 8b08778
Author: randgalt <randgalt@apache.org>
Authored: Sun Oct 11 15:51:09 2015 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Sun Oct 11 15:51:09 2015 -0500

----------------------------------------------------------------------
 .../recipes/nodes/PersistentEphemeralNode.java  | 101 +++++++++----------
 .../nodes/TestPersistentEphemeralNode.java      |  82 +++++++++++++++
 2 files changed, 129 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/9a9e18e2/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
----------------------------------------------------------------------
diff --cc curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
index 1606c36,a3298ab..fe42738
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
@@@ -21,9 -21,7 +21,8 @@@ package org.apache.curator.framework.re
  
  import com.google.common.annotations.VisibleForTesting;
  import com.google.common.base.Preconditions;
- 
  import org.apache.curator.framework.CuratorFramework;
 +import org.apache.curator.framework.WatcherRemoveCuratorFramework;
  import org.apache.curator.framework.api.ACLBackgroundPathAndBytesable;
  import org.apache.curator.framework.api.BackgroundCallback;
  import org.apache.curator.framework.api.CreateModable;

http://git-wip-us.apache.org/repos/asf/curator/blob/9a9e18e2/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 20cc028,84eaa52..7ee768b
--- 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
@@@ -733,9 -794,14 +810,14 @@@ public class TestPersistentEphemeralNod
              return new Trigger(Event.EventType.NodeCreated);
          }
  
 -        private static Trigger deleted()
 +        private static Trigger deletedOrSetData()
          {
 -            return new Trigger(Event.EventType.NodeDeleted);
 +            return new Trigger(Event.EventType.NodeDeleted, EventType.NodeDataChanged);
          }
+ 
+         private static Trigger dataChanged()
+         {
+             return new Trigger(EventType.NodeDataChanged);
+         }
      }
  }


Mime
View raw message