[4/4] curator git commit: Merge branch 'master' into CURATOR-3.0

2017-03-20 Thread randgalt 
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/6d41d4a8
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/6d41d4a8
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/6d41d4a8

Branch: refs/heads/CURATOR-3.0
Commit: 6d41d4a8025a8c982fc8fbd1c92b5cd9a3e3dacc
Parents: 850b6e4 2672049
Author: randgalt 
Authored: Mon Mar 20 09:10:45 2017 -0500
Committer: randgalt 
Committed: Mon Mar 20 09:10:45 2017 -0500

--
 .../recipes/cache/PathChildrenCache.java|  2 +-
 .../cache/TestPathChildrenCacheInCluster.java   | 60 
 2 files changed, 61 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/6d41d4a8/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
--

[4/4] curator git commit: Merge branch 'master' into CURATOR-3.0

2016-10-26 Thread cammckenzie 
Merge branch 'master' into CURATOR-3.0

Conflicts:
curator-client/src/main/java/org/apache/curator/ConnectionState.java

curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
curator-client/src/main/java/org/apache/curator/RetryLoop.java

curator-framework/src/main/java/org/apache/curator/framework/imps/BackgroundSyncImpl.java

curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java

curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java

curator-framework/src/main/java/org/apache/curator/framework/imps/GetACLBuilderImpl.java

curator-framework/src/main/java/org/apache/curator/framework/imps/GetChildrenBuilderImpl.java

curator-framework/src/main/java/org/apache/curator/framework/imps/GetDataBuilderImpl.java

curator-framework/src/main/java/org/apache/curator/framework/imps/SetACLBuilderImpl.java

curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java

curator-framework/src/main/java/org/apache/curator/framework/imps/SyncBuilderImpl.java


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d8798c21
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d8798c21
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d8798c21

Branch: refs/heads/CURATOR-3.0
Commit: d8798c21de10926cecd2ffc11f1ed7ce695c330a
Parents: d034aea dd20f1d
Author: Cam McKenzie 
Authored: Thu Oct 27 09:51:02 2016 +1100
Committer: Cam McKenzie 
Committed: Thu Oct 27 09:51:02 2016 +1100

--
 .../org/apache/curator/test/InstanceSpec.java   | 28 ++-
 .../curator/test/QuorumConfigBuilder.java   |  7 +++
 .../curator/test/TestQuorumConfigBuilder.java   | 49 
 3 files changed, 82 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/d8798c21/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
--
diff --cc curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
index 6d495df,32b1738..0a71161
--- a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
+++ b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
@@@ -69,11 -71,8 +71,12 @@@ public class InstanceSpe
  private final int serverId;
  private final int tickTime;
  private final int maxClientCnxns;
+ private final Map customProperties;
  
 +public static void reset() {
 +nextServerId.set(1);
 +}
 +
  public static InstanceSpec newInstanceSpec()
  {
  return new InstanceSpec(null, -1, -1, -1, true, -1, -1, -1);

http://git-wip-us.apache.org/repos/asf/curator/blob/d8798c21/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
--
diff --cc 
curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
index 17bb185,4e20163..5baf5ce
--- 
a/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
+++ 
b/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
@@@ -23,11 -22,10 +23,12 @@@ import com.google.common.base.Throwable
  import com.google.common.collect.ImmutableList;
  import com.google.common.io.Files;
  import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
 +import java.io.Closeable;
  import java.io.File;
 +import java.io.IOException;
  import java.util.Collection;
  import java.util.List;
+ import java.util.Map;
  import java.util.Properties;
  
  @SuppressWarnings("UnusedDeclaration")
@@@ -123,19 -100,17 +124,25 @@@ public class QuorumConfigBuilder implem
  {
  for ( InstanceSpec thisSpec : instanceSpecs )
  {
 -properties.setProperty("server." + thisSpec.getServerId(), 
String.format("localhost:%d:%d", thisSpec.getQuorumPort(), 
thisSpec.getElectionPort()));
 +properties.setProperty("server." + thisSpec.getServerId(), 
String.format("localhost:%d:%d;localhost:%d", thisSpec.getQuorumPort(), 
thisSpec.getElectionPort(), thisSpec.getPort()));
  }
  }
+ Map customProperties = spec.getCustomProperties();
+ if (customProperties != null) {
+ for (Map.Entry property : 
customProperties.entrySet()) {
+ properties.put(property.getKey(), property.getValue());
+ }
+ }
  
 -QuorumPeerConfig config = new QuorumPeerConfig();
 +QuorumPeerConfig config = new QuorumPeerConfig()
 +{
 +{
 +if (

[4/4] curator git commit: Merge branch 'master' into CURATOR-3.0

2016-05-25 Thread dragonsinth 
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/eefdf8ee
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/eefdf8ee
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/eefdf8ee

Branch: refs/heads/CURATOR-3.0
Commit: eefdf8ee93ae9708ac52711e4981a2925bba2c40
Parents: c9b10d7 b4da5f5
Author: Scott Blum 
Authored: Wed May 25 23:38:45 2016 -0400
Committer: Scott Blum 
Committed: Wed May 25 23:38:45 2016 -0400

--
 .../framework/recipes/cache/TreeCache.java  | 20 +---
 .../recipes/cache/TestEventOrdering.java|  4 +++-
 2 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/eefdf8ee/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--

[4/4] curator git commit: Merge branch 'master' into CURATOR-3.0

2016-05-19 Thread randgalt 
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/48e2c15b
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/48e2c15b
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/48e2c15b

Branch: refs/heads/CURATOR-3.0
Commit: 48e2c15b8c3e3e6e5de97858898aa757e213fb02
Parents: 2180d05 3424fc1
Author: randgalt 
Authored: Thu May 19 21:38:15 2016 -0500
Committer: randgalt 
Committed: Thu May 19 21:38:15 2016 -0500

--
 .../framework/recipes/cache/TreeCache.java  |   4 +-
 .../recipes/cache/TestEventOrdering.java| 177 +++
 .../TestPathChildrenCacheEventOrdering.java |  55 ++
 .../cache/TestTreeCacheEventOrdering.java   |  58 ++
 4 files changed, 292 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/48e2c15b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--

[4/4] curator git commit: Merge branch 'master' into CURATOR-3.0

2015-10-11 Thread randgalt 
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 
Authored: Sun Oct 11 15:51:09 2015 -0500
Committer: randgalt 
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);
+ }
  }
  }