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

[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/b3939acd
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b3939acd
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b3939acd

Branch: refs/heads/master
Commit: b3939acd47b6198930812236678ceae6f6f6a7af
Parents: 6d41d4a 7d089ef
Author: Fangmin Lyu 
Authored: Fri Mar 31 22:33:25 2017 -0700
Committer: Fangmin Lyu 
Committed: Fri Mar 31 22:33:25 2017 -0700

--
 pom.xml | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/b3939acd/pom.xml
--

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

[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/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/master
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
--

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

[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/8e7fbac8
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8e7fbac8
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8e7fbac8

Branch: refs/heads/master
Commit: 8e7fbac86dfe14f18a540a6a10c75f5bfe74120a
Parents: 304da97 a47ab1e
Author: randgalt 
Authored: Mon Jan 16 13:27:31 2017 -0500
Committer: randgalt 
Committed: Mon Jan 16 13:27:31 2017 -0500

--
 curator-client/pom.xml  | 40 --
 curator-recipes/pom.xml |  6 +
 curator-test/pom.xml| 47 +++-
 curator-x-discovery/pom.xml |  6 +
 pom.xml | 43 +++-
 5 files changed, 133 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-client/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-recipes/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-test/pom.xml
--
diff --cc curator-test/pom.xml
index c81dfec,4cac12b..afc9f36
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@@ -41,11 -41,11 +41,6 @@@
  
  
  
- org.apache.commons
- commons-math
 -org.javassist
 -javassist
--
--
--
  com.google.guava
  guava
  

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-x-discovery/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/pom.xml
--

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

[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/540cd28a
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/540cd28a
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/540cd28a

Branch: refs/heads/master
Commit: 540cd28a33bccc6423765851631a02dcd974b89f
Parents: f645190 2342578
Author: randgalt 
Authored: Wed Jan 11 21:44:46 2017 -0500
Committer: randgalt 
Committed: Wed Jan 11 21:44:46 2017 -0500

--
 .../src/main/java/org/apache/curator/utils/DebugUtils.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/540cd28a/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
--
diff --cc curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
index beea726,ce751ec..45eea22
--- a/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
@@@ -21,12 -20,10 +21,13 @@@ package org.apache.curator.utils
  
  public class DebugUtils
  {
 -public static final String  PROPERTY_LOG_EVENTS = 
"curator-log-events";
 -public static final String  PROPERTY_DONT_LOG_CONNECTION_ISSUES = 
"curator-dont-log-connection-problems";
 -public static final String  
PROPERTY_LOG_ONLY_FIRST_CONNECTION_ISSUE_AS_ERROR_LEVEL = 
"curator-log-only-first-connection-issue-as-error-level";
 +public static final String PROPERTY_LOG_EVENTS = "curator-log-events";
 +public static final String PROPERTY_DONT_LOG_CONNECTION_ISSUES = 
"curator-dont-log-connection-problems";
 +public static final String 
PROPERTY_LOG_ONLY_FIRST_CONNECTION_ISSUE_AS_ERROR_LEVEL = 
"curator-log-only-first-connection-issue-as-error-level";
 +public static final String PROPERTY_REMOVE_WATCHERS_IN_FOREGROUND = 
"curator-remove-watchers-in-foreground";
 +public static final String PROPERTY_VALIDATE_NAMESPACE_WATCHER_MAP_EMPTY 
= "curator-validate-namespace-watcher-map-empty";
 +
+ 
  private DebugUtils()
  {
  }

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

[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/00ffe779
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/00ffe779
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/00ffe779

Branch: refs/heads/master
Commit: 00ffe77951a88ea12c60a506a9beff1ae78de300
Parents: 1939389 302661a
Author: randgalt 
Authored: Mon Apr 17 19:00:10 2017 -0500
Committer: randgalt 
Committed: Mon Apr 17 19:00:10 2017 -0500

--
 .../apache/curator/framework/recipes/nodes/PersistentNode.java | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/00ffe779/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
--

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

[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/d7a65ad5
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d7a65ad5
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d7a65ad5

Branch: refs/heads/master
Commit: d7a65ad5e90c26cb487fe864146b01277dd8cc1a
Parents: 62f428c e2aef81
Author: randgalt 
Authored: Tue Feb 28 19:55:52 2017 -0300
Committer: randgalt 
Committed: Tue Feb 28 19:55:52 2017 -0300

--
 .../apache/curator/ConnectionStateAccessor.java | 45 
 1 file changed, 45 insertions(+)
--

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

[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/b58cfd06
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b58cfd06
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b58cfd06

Branch: refs/heads/master
Commit: b58cfd068dbe4771f83365124693049b6051f63e
Parents: da48ef3 6d392ec
Author: randgalt 
Authored: Sun Jan 8 11:11:17 2017 -0500
Committer: randgalt 
Committed: Sun Jan 8 11:11:17 2017 -0500

--
 .../framework/recipes/locks/InterProcessSemaphore.java   | 6 ++
 .../framework/recipes/locks/InterProcessSemaphoreV2.java | 5 +
 .../org/apache/curator/framework/recipes/locks/Lease.java| 8 
 3 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/b58cfd06/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
--

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

[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/83636928
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/83636928
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/83636928

Branch: refs/heads/master
Commit: 8363692841ea46caebd25f7fe8e61b5bc8295bab
Parents: 8e7fbac 467513b
Author: randgalt 
Authored: Mon Jan 23 21:07:23 2017 -0500
Committer: randgalt 
Committed: Mon Jan 23 21:07:23 2017 -0500

--
 .../curator/x/discovery/ServiceInstance.java|  32 +-
 .../x/discovery/ServiceInstanceBuilder.java |   9 +-
 .../discovery/details/ServiceProviderImpl.java  |   8 ++
 .../x/discovery/TestJsonInstanceSerializer.java |  35 --
 .../discovery/details/TestServiceProvider.java  | 109 +++
 5 files changed, 181 insertions(+), 12 deletions(-)
--

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

[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/90b39dd8
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/90b39dd8
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/90b39dd8

Branch: refs/heads/master
Commit: 90b39dd87ce8e96dc4d25633960ec7583d33b3d6
Parents: 770aa41 0ad09eb
Author: randgalt 
Authored: Mon Jan 9 14:23:49 2017 -0500
Committer: randgalt 
Committed: Mon Jan 9 14:23:49 2017 -0500

--
 .../framework/recipes/nodes/PersistentNode.java   | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/90b39dd8/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
--

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

[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/da48ef38
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/da48ef38
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/da48ef38

Branch: refs/heads/master
Commit: da48ef388f6153e66d251121854bb0faae77a3ec
Parents: e683264 d3bccce
Author: randgalt 
Authored: Sun Jan 8 00:43:32 2017 -0500
Committer: randgalt 
Committed: Sun Jan 8 00:43:32 2017 -0500

--
 .../framework/recipes/cache/TreeCache.java  | 67 
 .../locks/InterProcessSemaphoreMutex.java   | 13 ++--
 2 files changed, 43 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/da48ef38/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
index ed32223,3ffb58f..9bf2789
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
@@@ -286,8 -290,9 +297,8 @@@ public class TreeCache implements Close
  
  void wasDeleted() throws Exception
  {
- ChildData oldChildData = childData.getAndSet(null);
- ConcurrentMap childMap = 
children.getAndSet(null);
+ ChildData oldChildData = childDataUpdater.getAndSet(this, null);
 -client.clearWatcherReferences(this);
+ ConcurrentMap childMap = 
childrenUpdater.getAndSet(this,null);
  if ( childMap != null )
  {
  ArrayList childCopy = new 
ArrayList(childMap.values());

http://git-wip-us.apache.org/repos/asf/curator/blob/da48ef38/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
index 444b10d,ba3b649..57e2c80
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
@@@ -64,17 -61,10 +64,12 @@@ public class InterProcessSemaphoreMute
  @Override
  public void release() throws Exception
  {
+ Lease lease = this.lease;
  Preconditions.checkState(lease != null, "Not acquired");
 +
- try
- {
- lease.close();
- watcherRemoveClient.removeWatchers();
- }
- finally
- {
- lease = null;
- }
+ this.lease = null;
+ lease.close();
++watcherRemoveClient.removeWatchers();
  }
  
  @Override

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

[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/00ffe779
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/00ffe779
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/00ffe779

Branch: refs/heads/CURATOR-351
Commit: 00ffe77951a88ea12c60a506a9beff1ae78de300
Parents: 1939389 302661a
Author: randgalt 
Authored: Mon Apr 17 19:00:10 2017 -0500
Committer: randgalt 
Committed: Mon Apr 17 19:00:10 2017 -0500

--
 .../apache/curator/framework/recipes/nodes/PersistentNode.java | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/00ffe779/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
--

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

[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/00ffe779
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/00ffe779
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/00ffe779

Branch: refs/heads/CURATOR-3.0
Commit: 00ffe77951a88ea12c60a506a9beff1ae78de300
Parents: 1939389 302661a
Author: randgalt 
Authored: Mon Apr 17 19:00:10 2017 -0500
Committer: randgalt 
Committed: Mon Apr 17 19:00:10 2017 -0500

--
 .../apache/curator/framework/recipes/nodes/PersistentNode.java | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/00ffe779/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
--

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

[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/191aca24
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/191aca24
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/191aca24

Branch: refs/heads/CURATOR-351
Commit: 191aca247dc17d7657a3aaf2c678d29036e992cb
Parents: b3939ac 649e490
Author: randgalt 
Authored: Mon Apr 3 11:50:37 2017 -0500
Committer: randgalt 
Committed: Mon Apr 3 11:50:37 2017 -0500

--
 doap.rdf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--

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

[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/191aca24
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/191aca24
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/191aca24

Branch: refs/heads/CURATOR-3.0
Commit: 191aca247dc17d7657a3aaf2c678d29036e992cb
Parents: b3939ac 649e490
Author: randgalt 
Authored: Mon Apr 3 11:50:37 2017 -0500
Committer: randgalt 
Committed: Mon Apr 3 11:50:37 2017 -0500

--
 doap.rdf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--

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

[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/b3939acd
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b3939acd
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b3939acd

Branch: refs/heads/CURATOR-351
Commit: b3939acd47b6198930812236678ceae6f6f6a7af
Parents: 6d41d4a 7d089ef
Author: Fangmin Lyu 
Authored: Fri Mar 31 22:33:25 2017 -0700
Committer: Fangmin Lyu 
Committed: Fri Mar 31 22:33:25 2017 -0700

--
 pom.xml | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/b3939acd/pom.xml
--

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

[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/0e23fbac
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/0e23fbac
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/0e23fbac

Branch: refs/heads/CURATOR-351
Commit: 0e23fbac1be51df269f1b396af03980f8a614cab
Parents: 7d44bae 337b9d9
Author: randgalt 
Authored: Sat Mar 11 15:51:56 2017 -0800
Committer: randgalt 
Committed: Sat Mar 11 15:51:56 2017 -0800

--
 .../org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/0e23fbac/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
--
diff --cc 
curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
index 5f486f4,ce650a9..0762607
--- 
a/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
+++ 
b/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
@@@ -19,10 -19,9 +19,11 @@@
  package org.apache.curator.ensemble.fixed;
  
  import com.google.common.base.Preconditions;
+ import com.google.common.base.Strings;
  import org.apache.curator.ensemble.EnsembleProvider;
 +import org.apache.zookeeper.ZooKeeper;
  import java.io.IOException;
 +import java.util.concurrent.atomic.AtomicReference;
  
  /**
   * Standard ensemble provider that wraps a fixed connection string
@@@ -39,19 -37,9 +40,20 @@@ public class FixedEnsembleProvider impl
   */
  public FixedEnsembleProvider(String connectionString)
  {
 -Preconditions.checkArgument(!Strings.isNullOrEmpty(connectionString),
 -"connectionString cannot be null or empty");
 -this.connectionString = connectionString;
 +this(connectionString, true);
 +}
 +
 +/**
 + * The connection string to use
 + *
 + * @param connectionString connection string
 + * @param updateServerListEnabled if true, allow Curator to call {@link 
ZooKeeper#updateServerList(String)}
 + */
 +public FixedEnsembleProvider(String connectionString, boolean 
updateServerListEnabled)
 +{
 +this.updateServerListEnabled = updateServerListEnabled;
- 
this.connectionString.set(Preconditions.checkNotNull(connectionString, 
"connectionString cannot be null"));
++Preconditions.checkArgument(!Strings.isNullOrEmpty(connectionString), 
"connectionString cannot be null or empty");
++this.connectionString.set(connectionString);
  }
  
  @Override

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

[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/8e7fbac8
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8e7fbac8
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8e7fbac8

Branch: refs/heads/CURATOR-351
Commit: 8e7fbac86dfe14f18a540a6a10c75f5bfe74120a
Parents: 304da97 a47ab1e
Author: randgalt 
Authored: Mon Jan 16 13:27:31 2017 -0500
Committer: randgalt 
Committed: Mon Jan 16 13:27:31 2017 -0500

--
 curator-client/pom.xml  | 40 --
 curator-recipes/pom.xml |  6 +
 curator-test/pom.xml| 47 +++-
 curator-x-discovery/pom.xml |  6 +
 pom.xml | 43 +++-
 5 files changed, 133 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-client/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-recipes/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-test/pom.xml
--
diff --cc curator-test/pom.xml
index c81dfec,4cac12b..afc9f36
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@@ -41,11 -41,11 +41,6 @@@
  
  
  
- org.apache.commons
- commons-math
 -org.javassist
 -javassist
--
--
--
  com.google.guava
  guava
  

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-x-discovery/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/pom.xml
--

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

[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/850b6e4e
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/850b6e4e
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/850b6e4e

Branch: refs/heads/CURATOR-351
Commit: 850b6e4e427028aa6366cd51d524570a10343a97
Parents: 0e23fba 29fb6de
Author: randgalt 
Authored: Sat Mar 18 09:43:10 2017 -0500
Committer: randgalt 
Committed: Sat Mar 18 09:43:10 2017 -0500

--
 README   |  7 ---
 README.md| 11 +++
 src/site/confluence/index.confluence |  2 ++
 3 files changed, 13 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/850b6e4e/src/site/confluence/index.confluence
--

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

[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/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/CURATOR-351
Commit: 7d44baee3d87890b67fc4900f204bb5111368079
Parents: 87a145c 1571588
Author: randgalt 
Authored: Thu Mar 9 14:28:15 2017 -0800
Committer: randgalt 
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;

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

[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/83636928
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/83636928
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/83636928

Branch: refs/heads/CURATOR-351
Commit: 8363692841ea46caebd25f7fe8e61b5bc8295bab
Parents: 8e7fbac 467513b
Author: randgalt 
Authored: Mon Jan 23 21:07:23 2017 -0500
Committer: randgalt 
Committed: Mon Jan 23 21:07:23 2017 -0500

--
 .../curator/x/discovery/ServiceInstance.java|  32 +-
 .../x/discovery/ServiceInstanceBuilder.java |   9 +-
 .../discovery/details/ServiceProviderImpl.java  |   8 ++
 .../x/discovery/TestJsonInstanceSerializer.java |  35 --
 .../discovery/details/TestServiceProvider.java  | 109 +++
 5 files changed, 181 insertions(+), 12 deletions(-)
--

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

[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-351
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
--

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

[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/d7a65ad5
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d7a65ad5
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d7a65ad5

Branch: refs/heads/CURATOR-351
Commit: d7a65ad5e90c26cb487fe864146b01277dd8cc1a
Parents: 62f428c e2aef81
Author: randgalt 
Authored: Tue Feb 28 19:55:52 2017 -0300
Committer: randgalt 
Committed: Tue Feb 28 19:55:52 2017 -0300

--
 .../apache/curator/ConnectionStateAccessor.java | 45 
 1 file changed, 45 insertions(+)
--

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

[fangmin]

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/b3939acd
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b3939acd
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b3939acd

Branch: refs/heads/CURATOR-3.0
Commit: b3939acd47b6198930812236678ceae6f6f6a7af
Parents: 6d41d4a 7d089ef
Author: Fangmin Lyu 
Authored: Fri Mar 31 22:33:25 2017 -0700
Committer: Fangmin Lyu 
Committed: Fri Mar 31 22:33:25 2017 -0700

--
 pom.xml | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/b3939acd/pom.xml
--

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

[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
--

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

[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/850b6e4e
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/850b6e4e
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/850b6e4e

Branch: refs/heads/CURATOR-3.0
Commit: 850b6e4e427028aa6366cd51d524570a10343a97
Parents: 0e23fba 29fb6de
Author: randgalt 
Authored: Sat Mar 18 09:43:10 2017 -0500
Committer: randgalt 
Committed: Sat Mar 18 09:43:10 2017 -0500

--
 README   |  7 ---
 README.md| 11 +++
 src/site/confluence/index.confluence |  2 ++
 3 files changed, 13 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/850b6e4e/src/site/confluence/index.confluence
--

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

[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/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/persistent-watch
Commit: 7d44baee3d87890b67fc4900f204bb5111368079
Parents: 87a145c 1571588
Author: randgalt 
Authored: Thu Mar 9 14:28:15 2017 -0800
Committer: randgalt 
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;

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

[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/0e23fbac
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/0e23fbac
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/0e23fbac

Branch: refs/heads/CURATOR-3.0
Commit: 0e23fbac1be51df269f1b396af03980f8a614cab
Parents: 7d44bae 337b9d9
Author: randgalt 
Authored: Sat Mar 11 15:51:56 2017 -0800
Committer: randgalt 
Committed: Sat Mar 11 15:51:56 2017 -0800

--
 .../org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/0e23fbac/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
--
diff --cc 
curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
index 5f486f4,ce650a9..0762607
--- 
a/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
+++ 
b/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
@@@ -19,10 -19,9 +19,11 @@@
  package org.apache.curator.ensemble.fixed;
  
  import com.google.common.base.Preconditions;
+ import com.google.common.base.Strings;
  import org.apache.curator.ensemble.EnsembleProvider;
 +import org.apache.zookeeper.ZooKeeper;
  import java.io.IOException;
 +import java.util.concurrent.atomic.AtomicReference;
  
  /**
   * Standard ensemble provider that wraps a fixed connection string
@@@ -39,19 -37,9 +40,20 @@@ public class FixedEnsembleProvider impl
   */
  public FixedEnsembleProvider(String connectionString)
  {
 -Preconditions.checkArgument(!Strings.isNullOrEmpty(connectionString),
 -"connectionString cannot be null or empty");
 -this.connectionString = connectionString;
 +this(connectionString, true);
 +}
 +
 +/**
 + * The connection string to use
 + *
 + * @param connectionString connection string
 + * @param updateServerListEnabled if true, allow Curator to call {@link 
ZooKeeper#updateServerList(String)}
 + */
 +public FixedEnsembleProvider(String connectionString, boolean 
updateServerListEnabled)
 +{
 +this.updateServerListEnabled = updateServerListEnabled;
- 
this.connectionString.set(Preconditions.checkNotNull(connectionString, 
"connectionString cannot be null"));
++Preconditions.checkArgument(!Strings.isNullOrEmpty(connectionString), 
"connectionString cannot be null or empty");
++this.connectionString.set(connectionString);
  }
  
  @Override

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

[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/d7a65ad5
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d7a65ad5
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d7a65ad5

Branch: refs/heads/CURATOR-3.0
Commit: d7a65ad5e90c26cb487fe864146b01277dd8cc1a
Parents: 62f428c e2aef81
Author: randgalt 
Authored: Tue Feb 28 19:55:52 2017 -0300
Committer: randgalt 
Committed: Tue Feb 28 19:55:52 2017 -0300

--
 .../apache/curator/ConnectionStateAccessor.java | 45 
 1 file changed, 45 insertions(+)
--

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

[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/5cf7d050
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/5cf7d050
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/5cf7d050

Branch: refs/heads/persistent-watch
Commit: 5cf7d050fa9905332e358cfaeb93d2e739d158a0
Parents: 540cd28 cc49ae9
Author: randgalt 
Authored: Thu Jan 12 12:09:03 2017 -0500
Committer: randgalt 
Committed: Thu Jan 12 12:09:03 2017 -0500

--
 .../recipes/nodes/TestGroupMember.java  | 28 
 1 file changed, 23 insertions(+), 5 deletions(-)
--

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

[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/770aa411
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/770aa411
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/770aa411

Branch: refs/heads/persistent-watch
Commit: 770aa411d00f97ce6040f2b4182d6f0fe744262d
Parents: b58cfd0 144977f
Author: randgalt 
Authored: Mon Jan 9 11:27:24 2017 -0500
Committer: randgalt 
Committed: Mon Jan 9 11:27:24 2017 -0500

--
 .../apache/curator/framework/recipes/nodes/PersistentNode.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/770aa411/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
index 8375967,45f74ca..ecb5e57
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
@@@ -61,8 -59,7 +61,7 @@@ public class PersistentNode implements 
  {
  private final AtomicReference initialCreateLatch = new 
AtomicReference(new CountDownLatch(1));
  private final Logger log = LoggerFactory.getLogger(getClass());
 -private final CuratorFramework client;
 +private final WatcherRemoveCuratorFramework client;
- private final CreateModable 
createMethod;
  private final AtomicReference nodePath = new 
AtomicReference(null);
  private final String basePath;
  private final CreateMode mode;

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

[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/540cd28a
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/540cd28a
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/540cd28a

Branch: refs/heads/persistent-watch
Commit: 540cd28a33bccc6423765851631a02dcd974b89f
Parents: f645190 2342578
Author: randgalt 
Authored: Wed Jan 11 21:44:46 2017 -0500
Committer: randgalt 
Committed: Wed Jan 11 21:44:46 2017 -0500

--
 .../src/main/java/org/apache/curator/utils/DebugUtils.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/540cd28a/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
--
diff --cc curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
index beea726,ce751ec..45eea22
--- a/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
@@@ -21,12 -20,10 +21,13 @@@ package org.apache.curator.utils
  
  public class DebugUtils
  {
 -public static final String  PROPERTY_LOG_EVENTS = 
"curator-log-events";
 -public static final String  PROPERTY_DONT_LOG_CONNECTION_ISSUES = 
"curator-dont-log-connection-problems";
 -public static final String  
PROPERTY_LOG_ONLY_FIRST_CONNECTION_ISSUE_AS_ERROR_LEVEL = 
"curator-log-only-first-connection-issue-as-error-level";
 +public static final String PROPERTY_LOG_EVENTS = "curator-log-events";
 +public static final String PROPERTY_DONT_LOG_CONNECTION_ISSUES = 
"curator-dont-log-connection-problems";
 +public static final String 
PROPERTY_LOG_ONLY_FIRST_CONNECTION_ISSUE_AS_ERROR_LEVEL = 
"curator-log-only-first-connection-issue-as-error-level";
 +public static final String PROPERTY_REMOVE_WATCHERS_IN_FOREGROUND = 
"curator-remove-watchers-in-foreground";
 +public static final String PROPERTY_VALIDATE_NAMESPACE_WATCHER_MAP_EMPTY 
= "curator-validate-namespace-watcher-map-empty";
 +
+ 
  private DebugUtils()
  {
  }

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

[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/90b39dd8
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/90b39dd8
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/90b39dd8

Branch: refs/heads/persistent-watch
Commit: 90b39dd87ce8e96dc4d25633960ec7583d33b3d6
Parents: 770aa41 0ad09eb
Author: randgalt 
Authored: Mon Jan 9 14:23:49 2017 -0500
Committer: randgalt 
Committed: Mon Jan 9 14:23:49 2017 -0500

--
 .../framework/recipes/nodes/PersistentNode.java   | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/90b39dd8/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
--

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

[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/83636928
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/83636928
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/83636928

Branch: refs/heads/persistent-watch
Commit: 8363692841ea46caebd25f7fe8e61b5bc8295bab
Parents: 8e7fbac 467513b
Author: randgalt 
Authored: Mon Jan 23 21:07:23 2017 -0500
Committer: randgalt 
Committed: Mon Jan 23 21:07:23 2017 -0500

--
 .../curator/x/discovery/ServiceInstance.java|  32 +-
 .../x/discovery/ServiceInstanceBuilder.java |   9 +-
 .../discovery/details/ServiceProviderImpl.java  |   8 ++
 .../x/discovery/TestJsonInstanceSerializer.java |  35 --
 .../discovery/details/TestServiceProvider.java  | 109 +++
 5 files changed, 181 insertions(+), 12 deletions(-)
--

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

[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/b58cfd06
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b58cfd06
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b58cfd06

Branch: refs/heads/persistent-watch
Commit: b58cfd068dbe4771f83365124693049b6051f63e
Parents: da48ef3 6d392ec
Author: randgalt 
Authored: Sun Jan 8 11:11:17 2017 -0500
Committer: randgalt 
Committed: Sun Jan 8 11:11:17 2017 -0500

--
 .../framework/recipes/locks/InterProcessSemaphore.java   | 6 ++
 .../framework/recipes/locks/InterProcessSemaphoreV2.java | 5 +
 .../org/apache/curator/framework/recipes/locks/Lease.java| 8 
 3 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/b58cfd06/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
--

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

[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/da48ef38
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/da48ef38
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/da48ef38

Branch: refs/heads/persistent-watch
Commit: da48ef388f6153e66d251121854bb0faae77a3ec
Parents: e683264 d3bccce
Author: randgalt 
Authored: Sun Jan 8 00:43:32 2017 -0500
Committer: randgalt 
Committed: Sun Jan 8 00:43:32 2017 -0500

--
 .../framework/recipes/cache/TreeCache.java  | 67 
 .../locks/InterProcessSemaphoreMutex.java   | 13 ++--
 2 files changed, 43 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/da48ef38/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
index ed32223,3ffb58f..9bf2789
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
@@@ -286,8 -290,9 +297,8 @@@ public class TreeCache implements Close
  
  void wasDeleted() throws Exception
  {
- ChildData oldChildData = childData.getAndSet(null);
- ConcurrentMap childMap = 
children.getAndSet(null);
+ ChildData oldChildData = childDataUpdater.getAndSet(this, null);
 -client.clearWatcherReferences(this);
+ ConcurrentMap childMap = 
childrenUpdater.getAndSet(this,null);
  if ( childMap != null )
  {
  ArrayList childCopy = new 
ArrayList(childMap.values());

http://git-wip-us.apache.org/repos/asf/curator/blob/da48ef38/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
index 444b10d,ba3b649..57e2c80
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
@@@ -64,17 -61,10 +64,12 @@@ public class InterProcessSemaphoreMute
  @Override
  public void release() throws Exception
  {
+ Lease lease = this.lease;
  Preconditions.checkState(lease != null, "Not acquired");
 +
- try
- {
- lease.close();
- watcherRemoveClient.removeWatchers();
- }
- finally
- {
- lease = null;
- }
+ this.lease = null;
+ lease.close();
++watcherRemoveClient.removeWatchers();
  }
  
  @Override

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

[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/83636928
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/83636928
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/83636928

Branch: refs/heads/CURATOR-3.0
Commit: 8363692841ea46caebd25f7fe8e61b5bc8295bab
Parents: 8e7fbac 467513b
Author: randgalt 
Authored: Mon Jan 23 21:07:23 2017 -0500
Committer: randgalt 
Committed: Mon Jan 23 21:07:23 2017 -0500

--
 .../curator/x/discovery/ServiceInstance.java|  32 +-
 .../x/discovery/ServiceInstanceBuilder.java |   9 +-
 .../discovery/details/ServiceProviderImpl.java  |   8 ++
 .../x/discovery/TestJsonInstanceSerializer.java |  35 --
 .../discovery/details/TestServiceProvider.java  | 109 +++
 5 files changed, 181 insertions(+), 12 deletions(-)
--

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

[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/8e7fbac8
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8e7fbac8
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8e7fbac8

Branch: refs/heads/CURATOR-3.0
Commit: 8e7fbac86dfe14f18a540a6a10c75f5bfe74120a
Parents: 304da97 a47ab1e
Author: randgalt 
Authored: Mon Jan 16 13:27:31 2017 -0500
Committer: randgalt 
Committed: Mon Jan 16 13:27:31 2017 -0500

--
 curator-client/pom.xml  | 40 --
 curator-recipes/pom.xml |  6 +
 curator-test/pom.xml| 47 +++-
 curator-x-discovery/pom.xml |  6 +
 pom.xml | 43 +++-
 5 files changed, 133 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-client/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-recipes/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-test/pom.xml
--
diff --cc curator-test/pom.xml
index c81dfec,4cac12b..afc9f36
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@@ -41,11 -41,11 +41,6 @@@
  
  
  
- org.apache.commons
- commons-math
 -org.javassist
 -javassist
--
--
--
  com.google.guava
  guava
  

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-x-discovery/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/pom.xml
--

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

[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/770aa411
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/770aa411
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/770aa411

Branch: refs/heads/CURATOR-3.0
Commit: 770aa411d00f97ce6040f2b4182d6f0fe744262d
Parents: b58cfd0 144977f
Author: randgalt 
Authored: Mon Jan 9 11:27:24 2017 -0500
Committer: randgalt 
Committed: Mon Jan 9 11:27:24 2017 -0500

--
 .../apache/curator/framework/recipes/nodes/PersistentNode.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/770aa411/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
index 8375967,45f74ca..ecb5e57
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
@@@ -61,8 -59,7 +61,7 @@@ public class PersistentNode implements 
  {
  private final AtomicReference initialCreateLatch = new 
AtomicReference(new CountDownLatch(1));
  private final Logger log = LoggerFactory.getLogger(getClass());
 -private final CuratorFramework client;
 +private final WatcherRemoveCuratorFramework client;
- private final CreateModable 
createMethod;
  private final AtomicReference nodePath = new 
AtomicReference(null);
  private final String basePath;
  private final CreateMode mode;

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

[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/b58cfd06
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b58cfd06
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b58cfd06

Branch: refs/heads/CURATOR-3.0
Commit: b58cfd068dbe4771f83365124693049b6051f63e
Parents: da48ef3 6d392ec
Author: randgalt 
Authored: Sun Jan 8 11:11:17 2017 -0500
Committer: randgalt 
Committed: Sun Jan 8 11:11:17 2017 -0500

--
 .../framework/recipes/locks/InterProcessSemaphore.java   | 6 ++
 .../framework/recipes/locks/InterProcessSemaphoreV2.java | 5 +
 .../org/apache/curator/framework/recipes/locks/Lease.java| 8 
 3 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/b58cfd06/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
--

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

[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/da48ef38
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/da48ef38
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/da48ef38

Branch: refs/heads/CURATOR-3.0
Commit: da48ef388f6153e66d251121854bb0faae77a3ec
Parents: e683264 d3bccce
Author: randgalt 
Authored: Sun Jan 8 00:43:32 2017 -0500
Committer: randgalt 
Committed: Sun Jan 8 00:43:32 2017 -0500

--
 .../framework/recipes/cache/TreeCache.java  | 67 
 .../locks/InterProcessSemaphoreMutex.java   | 13 ++--
 2 files changed, 43 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/da48ef38/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
index ed32223,3ffb58f..9bf2789
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
@@@ -286,8 -290,9 +297,8 @@@ public class TreeCache implements Close
  
  void wasDeleted() throws Exception
  {
- ChildData oldChildData = childData.getAndSet(null);
- ConcurrentMap childMap = 
children.getAndSet(null);
+ ChildData oldChildData = childDataUpdater.getAndSet(this, null);
 -client.clearWatcherReferences(this);
+ ConcurrentMap childMap = 
childrenUpdater.getAndSet(this,null);
  if ( childMap != null )
  {
  ArrayList childCopy = new 
ArrayList(childMap.values());

http://git-wip-us.apache.org/repos/asf/curator/blob/da48ef38/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
index 444b10d,ba3b649..57e2c80
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreMutex.java
@@@ -64,17 -61,10 +64,12 @@@ public class InterProcessSemaphoreMute
  @Override
  public void release() throws Exception
  {
+ Lease lease = this.lease;
  Preconditions.checkState(lease != null, "Not acquired");
 +
- try
- {
- lease.close();
- watcherRemoveClient.removeWatchers();
- }
- finally
- {
- lease = null;
- }
+ this.lease = null;
+ lease.close();
++watcherRemoveClient.removeWatchers();
  }
  
  @Override

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

[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/67cebe5c
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/67cebe5c
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/67cebe5c

Branch: refs/heads/CURATOR-3.0
Commit: 67cebe5c243b7e87a0cb475c909d907435f5d427
Parents: 9643542 125dc96
Author: randgalt 
Authored: Mon Dec 19 15:02:53 2016 -0500
Committer: randgalt 
Committed: Mon Dec 19 15:02:53 2016 -0500

--
 .../framework/imps/CreateBuilderImpl.java   |   6 +-
 .../recipes/leader/TestLeaderAcls.java  | 133 +++
 2 files changed, 138 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/67cebe5c/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
--

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

[cammckenzie]

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/adcaf340
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/adcaf340
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/adcaf340

Branch: refs/heads/CURATOR-3.0
Commit: adcaf340f32755f063d50eef6baf7b0740eb7e40
Parents: e6ed999 82a8906
Author: Cam McKenzie 
Authored: Wed Dec 7 13:49:15 2016 +1100
Committer: Cam McKenzie 
Committed: Wed Dec 7 13:49:15 2016 +1100

--
 .../org/apache/curator/framework/imps/NamespaceImpl.java  |  2 +-
 .../curator/framework/imps/TestNamespaceFacade.java   | 10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)
--

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

[cammckenzie]

Merge branch 'master' into CURATOR-3.0

Conflicts:

curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java


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

Branch: refs/heads/CURATOR-3.0
Commit: e6ed99965b6df91607b2505a3784780e51fa8c53
Parents: 60d24c2 0a0a1e7
Author: Cam McKenzie 
Authored: Mon Dec 5 13:05:07 2016 +1100
Committer: Cam McKenzie 
Committed: Mon Dec 5 13:05:07 2016 +1100

--
 .../org/apache/curator/test/InstanceSpec.java   | 34 +---
 .../curator/test/QuorumConfigBuilder.java   |  2 +-
 2 files changed, 30 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/e6ed9996/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 0a71161,bc0272c..d04e09f
--- a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
+++ b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
@@@ -72,11 -72,8 +72,12 @@@ public class InstanceSpe
  private final int tickTime;
  private final int maxClientCnxns;
  private final Map customProperties;
+ private final String hostname;
  
 +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/e6ed9996/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 5baf5ce,fb4039d..d385103
--- 
a/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
+++ 
b/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
@@@ -124,7 -100,7 +124,7 @@@ public class QuorumConfigBuilder implem
  {
  for ( InstanceSpec thisSpec : instanceSpecs )
  {
- properties.setProperty("server." + thisSpec.getServerId(), 
String.format("localhost:%d:%d;localhost:%d", thisSpec.getQuorumPort(), 
thisSpec.getElectionPort(), thisSpec.getPort()));
 -properties.setProperty("server." + thisSpec.getServerId(), 
String.format("%s:%d:%d", thisSpec.getHostname(), thisSpec.getQuorumPort(), 
thisSpec.getElectionPort()));
++properties.setProperty("server." + thisSpec.getServerId(), 
String.format("%s:%d:%d;%s:%d", thisSpec.getHostname(), 
thisSpec.getQuorumPort(), thisSpec.getElectionPort(), thisSpec.getHostname(), 
thisSpec.getPort()));
  }
  }
  Map customProperties = spec.getCustomProperties();

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

[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/905b062b
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/905b062b
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/905b062b

Branch: refs/heads/CURATOR-3.0
Commit: 905b062b370c3cff399f3f726a6d74ab44d7618e
Parents: d8798c2 e9bfb43
Author: randgalt 
Authored: Wed Nov 9 20:24:11 2016 -0500
Committer: randgalt 
Committed: Wed Nov 9 20:24:11 2016 -0500

--
 .../java/org/apache/curator/ConnectionState.java  | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/905b062b/curator-client/src/main/java/org/apache/curator/ConnectionState.java
--
diff --cc curator-client/src/main/java/org/apache/curator/ConnectionState.java
index 4191778,7044ddf..b5af9f2
--- a/curator-client/src/main/java/org/apache/curator/ConnectionState.java
+++ b/curator-client/src/main/java/org/apache/curator/ConnectionState.java
@@@ -178,7 -162,8 +178,7 @@@ class ConnectionState implements Watche
  
  for ( Watcher parentWatcher : parentWatchers )
  {
- OperationTrace trace = new 
OperationTrace("connection-state-parent-process", tracer.get());
 -
+ OperationTrace trace = new 
OperationTrace("connection-state-parent-process", tracer.get(), getSessionId());
  parentWatcher.process(event);
  trace.commit();
  }

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

[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 ( 

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

[cammckenzie]

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/693211e4
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/693211e4
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/693211e4

Branch: refs/heads/CURATOR-3.0
Commit: 693211e4141cef1e7f122edf677a60c6c7c5aeec
Parents: 3735b50 8c1b4be
Author: Cam McKenzie 
Authored: Thu Oct 13 13:25:01 2016 +1100
Committer: Cam McKenzie 
Committed: Thu Oct 13 13:25:01 2016 +1100

--
 .../framework/imps/GzipCompressionProvider.java | 26 +---
 1 file changed, 17 insertions(+), 9 deletions(-)
--

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

[cammckenzie]

Merge branch 'master' into CURATOR-3.0

Conflicts:

curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java

curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
pom.xml


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

Branch: refs/heads/CURATOR-3.0
Commit: 9e400bc8620430c245db86d08bafafe2ecb8534f
Parents: 9612c5f 022de39
Author: Cam McKenzie 
Authored: Wed Aug 31 11:01:23 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Aug 31 11:01:23 2016 +1000

--
 .../framework/recipes/shared/SharedValue.java   |  24 -
 .../recipes/shared/TestSharedCount.java | 106 +++
 2 files changed, 127 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/9e400bc8/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
index 7c2febd,1f9df37..1a3d889
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
@@@ -22,7 -22,8 +22,9 @@@ package org.apache.curator.framework.re
  import com.google.common.base.Function;
  import com.google.common.base.Preconditions;
  import org.apache.curator.framework.CuratorFramework;
 +import org.apache.curator.framework.WatcherRemoveCuratorFramework;
+ import org.apache.curator.framework.api.BackgroundCallback;
+ import org.apache.curator.framework.api.CuratorEvent;
  import org.apache.curator.framework.api.CuratorWatcher;
  import org.apache.curator.framework.listen.ListenerContainer;
  import org.apache.curator.framework.state.ConnectionState;

http://git-wip-us.apache.org/repos/asf/curator/blob/9e400bc8/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
--
diff --cc 
curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
index 28df3f9,7939f6e..0690d6a
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
@@@ -23,8 -23,11 +23,12 @@@ import com.google.common.collect.Lists
  import com.google.common.util.concurrent.ThreadFactoryBuilder;
  import org.apache.curator.framework.CuratorFramework;
  import org.apache.curator.framework.CuratorFrameworkFactory;
 +import org.apache.curator.framework.imps.TestCleanState;
+ import org.apache.curator.framework.api.BackgroundCallback;
+ import org.apache.curator.framework.api.CuratorEvent;
  import org.apache.curator.framework.state.ConnectionState;
+ import org.apache.curator.framework.state.ConnectionStateListener;
+ import org.apache.curator.retry.RetryNTimes;
  import org.apache.curator.retry.RetryOneTime;
  import org.apache.curator.test.BaseClassForTests;
  import org.apache.curator.test.Timing;
@@@ -321,4 -288,105 +326,105 @@@ public class TestSharedCount extends Ba
  CloseableUtils.closeQuietly(client1);
  }
  }
+ 
+ 
+ @Test
+ public void testDisconnectEventOnWatcherDoesNotRetry() throws Exception
+ {
+ final CountDownLatch gotSuspendEvent = new CountDownLatch(1);
+ 
+ CuratorFramework curatorFramework = 
CuratorFrameworkFactory.newClient(server.getConnectString(), new 
RetryNTimes(10, 1000));
+ curatorFramework.start();
+ curatorFramework.blockUntilConnected();
+ 
+ SharedCount sharedCount = new SharedCount(curatorFramework, "/count", 
10);
+ sharedCount.start();
+ 
+ curatorFramework.getConnectionStateListenable().addListener(new 
ConnectionStateListener() {
+ @Override
+ public void stateChanged(CuratorFramework client, ConnectionState 
newState) {
+ if (newState == ConnectionState.SUSPENDED) {
+ gotSuspendEvent.countDown();
+ }
+ }
+ });
+ 
+ try
+ {
+ server.stop();
+ // if watcher goes into 10second retry loop we won't get timely 
notification
+ Assert.assertTrue(gotSuspendEvent.await(5, TimeUnit.SECONDS));
+ }
+ finally
+ {
+ CloseableUtils.closeQuietly(sharedCount);
 -

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

[cammckenzie]

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 
Authored: Wed Jun 15 08:41:29 2016 +1000
Committer: Cam McKenzie 
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;

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

[cammckenzie]

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/d828dc0a
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d828dc0a
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d828dc0a

Branch: refs/heads/CURATOR-3.0
Commit: d828dc0a1e69e64e7213c8d52669926d3123
Parents: d94a54f 882437c
Author: Cam McKenzie 
Authored: Wed Jun 15 09:22:07 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:22:07 2016 +1000

--
 .../apache/curator/framework/recipes/cache/TestTreeCache.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/d828dc0a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
--

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

[cammckenzie]

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 
Authored: Wed Jun 15 12:10:44 2016 +1000
Committer: Cam McKenzie 
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;

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

[cammckenzie]

Merge branch 'master' into CURATOR-3.0

Conflicts:
curator-client/pom.xml
curator-examples/pom.xml
curator-framework/pom.xml
curator-recipes/pom.xml

curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java

curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
curator-test/pom.xml
curator-x-discovery-server/pom.xml
curator-x-discovery/pom.xml
curator-x-rpc/pom.xml
pom.xml


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

Branch: refs/heads/CURATOR-3.0
Commit: d27a70c283cfd2829b96147c8670a1e7dd59659e
Parents: a0dd0c9 8dc0283
Author: Cam McKenzie 
Authored: Mon Jun 6 10:47:39 2016 +1000
Committer: Cam McKenzie 
Committed: Mon Jun 6 10:47:39 2016 +1000

--
 .../recipes/locks/InterProcessSemaphoreV2.java  |  28 ++-
 .../locks/TestInterProcessSemaphore.java| 186 ++-
 2 files changed, 204 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/d27a70c2/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
index d967b98,2b9d48d..f343207
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
@@@ -46,7 -44,9 +46,8 @@@ import java.util.Arrays
  import java.util.Collection;
  import java.util.List;
  import java.util.Set;
+ import java.util.concurrent.CountDownLatch;
  import java.util.concurrent.TimeUnit;
 -import org.apache.curator.utils.PathUtils;
  
  /**
   * 
@@@ -357,38 -360,53 +361,56 @@@ public class InterProcessSemaphoreV
  String nodeName = ZKPaths.getNodeFromPath(path);
  lease = makeLease(path);
  
+ if ( debugAcquireLatch != null )
+ {
+ debugAcquireLatch.await();
+ }
+ 
 -synchronized(this)
 +try
  {
 -for(;;)
 +synchronized(this)
  {
 -List children;
 -try
 -{
 -children = 
client.getChildren().usingWatcher(watcher).forPath(leasesPath);
 -}
 -catch ( Exception e )
 -{
 -if ( debugFailedGetChildrenLatch != null )
 +for(;;)
- {
- List children = 
client.getChildren().usingWatcher(watcher).forPath(leasesPath);
++{
++List children;
++try
+ {
 -debugFailedGetChildrenLatch.countDown();
++children = 
client.getChildren().usingWatcher(watcher).forPath(leasesPath);
+ }
 -returnLease(lease); // otherwise the just created 
ZNode will be orphaned causing a dead lock
 -throw e;
 -}
 -if ( !children.contains(nodeName) )
 -{
 -log.error("Sequential path not found: " + path);
 -returnLease(lease);
 -return 
InternalAcquireResult.RETRY_DUE_TO_MISSING_NODE;
 -}
 -
 -if ( children.size() <= maxLeases )
 -{
 -break;
 -}
 -if ( hasWait )
 -{
 -long thisWaitMs = getThisWaitMs(startMs, waitMs);
 -if ( thisWaitMs <= 0 )
++catch ( Exception e )
+ {
++if ( debugFailedGetChildrenLatch != null )
++{
++debugFailedGetChildrenLatch.countDown();
++}
++returnLease(lease); // otherwise the just created 
ZNode will be orphaned causing a dead lock
++throw e;
++}
 +if ( !children.contains(nodeName) )
 +{
 + 

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

[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
--

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

[cammckenzie]

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/5ff8aaae
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/5ff8aaae
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/5ff8aaae

Branch: refs/heads/CURATOR-3.0
Commit: 5ff8aaae89f911316c3e4c2082cc5e780c8480ef
Parents: 20c6955 8f281eb
Author: Cam McKenzie 
Authored: Wed May 25 08:52:44 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 08:52:44 2016 +1000

--
 .../framework/recipes/shared/SharedValue.java   |  4 ++-
 .../recipes/shared/TestSharedCount.java | 27 
 2 files changed, 30 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/5ff8aaae/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
index e27f455,dddc471..7c2febd
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
@@@ -45,9 -44,11 +45,11 @@@ import java.util.concurrent.atomic.Atom
   */
  public class SharedValue implements Closeable, SharedValueReader
  {
+   private static final int UNINITIALIZED_VERSION = -1;
+ 
  private final Logger log = LoggerFactory.getLogger(getClass());
  private final ListenerContainer listeners = new 
ListenerContainer();
 -private final CuratorFramework client;
 +private final WatcherRemoveCuratorFramework client;
  private final String path;
  private final byte[] seedValue;
  private final AtomicReference state = new 
AtomicReference(State.LATENT);
@@@ -89,10 -90,10 +91,10 @@@
   */
  public SharedValue(CuratorFramework client, String path, byte[] seedValue)
  {
 -this.client = client;
 +this.client = client.newWatcherRemoveCuratorFramework();
  this.path = PathUtils.validatePath(path);
  this.seedValue = Arrays.copyOf(seedValue, seedValue.length);
- currentValue = new AtomicReference>(new 
VersionedValue(0, Arrays.copyOf(seedValue, seedValue.length)));
+ currentValue = new AtomicReference>(new 
VersionedValue(UNINITIALIZED_VERSION, Arrays.copyOf(seedValue, 
seedValue.length)));
  }
  
  @Override

http://git-wip-us.apache.org/repos/asf/curator/blob/5ff8aaae/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
--
diff --cc 
curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
index 2bdd278,a1f4d8c..16134ed
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
@@@ -253,8 -252,35 +253,35 @@@ public class TestSharedCount extends Ba
  {
  CloseableUtils.closeQuietly(count2);
  CloseableUtils.closeQuietly(count1);
 -CloseableUtils.closeQuietly(client2);
 -CloseableUtils.closeQuietly(client1);
 +TestCleanState.closeAndTestClean(client2);
 +TestCleanState.closeAndTestClean(client1);
  }
  }
+ 
+ 
+ @Test
+ public void testMultiClientDifferentSeed() throws Exception
+ {
+ CuratorFramework client1 = 
CuratorFrameworkFactory.newClient(server.getConnectString(), new 
RetryOneTime(1));
+ CuratorFramework client2 = 
CuratorFrameworkFactory.newClient(server.getConnectString(), new 
RetryOneTime(1));
+ SharedCount count1 = new SharedCount(client1, "/count", 10);
+ SharedCount count2 = new SharedCount(client2, "/count", 20);
+ try
+ {
+ client1.start();
+ client2.start();
+ count1.start();
+ count2.start();
+ 
+ Assert.assertEquals(count1.getCount(), 10);
+ Assert.assertEquals(count2.getCount(), 10);
+ }
+ finally
+ {
+ CloseableUtils.closeQuietly(count2);
+ CloseableUtils.closeQuietly(count1);
+ CloseableUtils.closeQuietly(client2);
+ CloseableUtils.closeQuietly(client1);
+ }
+ }
  }

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

[cammckenzie]

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/20c6955b
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/20c6955b
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/20c6955b

Branch: refs/heads/CURATOR-3.0
Commit: 20c6955b1e3fb9af2cac6fd6a7056b7f8ff14904
Parents: 6a245fb 6ae3f85
Author: Cam McKenzie 
Authored: Wed May 25 08:36:29 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 08:36:29 2016 +1000

--
 .../org/apache/curator/retry/BoundedExponentialBackoffRetry.java | 2 +-
 .../java/org/apache/curator/retry/ExponentialBackoffRetry.java   | 4 ++--
 .../src/main/java/org/apache/curator/retry/RetryNTimes.java  | 2 +-
 .../main/java/org/apache/curator/retry/RetryUntilElapsed.java| 2 +-
 .../src/main/java/org/apache/curator/retry/SleepingRetry.java| 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
--

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

[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/41a70042
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/41a70042
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/41a70042

Branch: refs/heads/CURATOR-3.0
Commit: 41a700429ad8cc57d96fe205164fbfc263673c22
Parents: 073ed35 d63e06e
Author: randgalt 
Authored: Sun May 22 22:31:31 2016 -0500
Committer: randgalt 
Committed: Sun May 22 22:31:31 2016 -0500

--
 .../framework/imps/ExistsBuilderImpl.java   |  6 +++-
 .../framework/imps/TestFrameworkEdges.java  | 38 
 .../recipes/cache/TestPathChildrenCache.java|  2 +-
 3 files changed, 44 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/41a70042/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
--

http://git-wip-us.apache.org/repos/asf/curator/blob/41a70042/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
--
diff --cc 
curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
index 70290ab,553fcb7..bf1c281
--- 
a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
+++ 
b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
@@@ -57,21 -60,42 +59,57 @@@ public class TestFrameworkEdges extend
  private final Timing timing = new Timing();
  
  @Test
+ public void testCreateContainersForBadConnect() throws Exception
+ {
+ final int serverPort = server.getPort();
+ server.close();
+ 
+ CuratorFramework client = 
CuratorFrameworkFactory.newClient(server.getConnectString(), 1000, 1000, new 
RetryForever(100));
+ try
+ {
+ new Thread()
+ {
+ @Override
+ public void run()
+ {
+ try
+ {
+ Thread.sleep(3000);
+ server = new TestingServer(serverPort, true);
+ }
+ catch ( Exception e )
+ {
+ e.printStackTrace();
+ }
+ }
+ }.start();
+ 
+ client.start();
+ client.createContainers("/this/does/not/exist");
+ 
Assert.assertNotNull(client.checkExists().forPath("/this/does/not/exist"));
+ }
+ finally
+ {
+ CloseableUtils.closeQuietly(client);
+ }
+ }
+ 
+ @Test
 +public void testQuickClose() throws Exception
 +{
 +CuratorFramework client = 
CuratorFrameworkFactory.newClient(server.getConnectString(), timing.session(), 
1, new RetryNTimes(0, 0));
 +try
 +{
 +client.start();
 +client.close();
 +}
 +finally
 +{
 +CloseableUtils.closeQuietly(client);
 +}
 +}
 +
 +@Test
  public void testProtectedCreateNodeDeletion() throws Exception
  {
  CuratorFramework client = 
CuratorFrameworkFactory.newClient(server.getConnectString(), timing.session(), 
1, new RetryNTimes(0, 0));

http://git-wip-us.apache.org/repos/asf/curator/blob/41a70042/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,887df54..39fbf66
--- 
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
@@@ -642,8 -634,7 +642,8 @@@ public class TestPathChildrenCache exte
  }
  finally
  {
- CloseableUtils.closeQuietly(cache);
 -client.close();
++CloseableUtils.closeQuietly(cache);∑
 +TestCleanState.closeAndTestClean(client);
  }
  }
  

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

[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/073ed35b
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/073ed35b
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/073ed35b

Branch: refs/heads/CURATOR-3.0
Commit: 073ed35be1448f6fe8bd27adafb2afbb1f9a5ddc
Parents: 80c497c 2f33faf
Author: randgalt 
Authored: Sun May 22 22:24:36 2016 -0500
Committer: randgalt 
Committed: Sun May 22 22:24:36 2016 -0500

--
 .../recipes/cache/PathChildrenCache.java|   1 +
 .../recipes/cache/TestPathChildrenCache.java| 109 +++
 2 files changed, 88 insertions(+), 22 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/curator/blob/073ed35b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
--

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

[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/80c497c6
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/80c497c6
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/80c497c6

Branch: refs/heads/CURATOR-3.0
Commit: 80c497c67d036ec7c7aa082334bd2aaa9204565d
Parents: 48e2c15 115346b
Author: randgalt 
Authored: Fri May 20 16:23:31 2016 -0500
Committer: randgalt 
Committed: Fri May 20 16:23:31 2016 -0500

--
 .../main/java/org/apache/curator/framework/imps/NamespaceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

[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
--

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

[randgalt]

Merge branch 'master' into CURATOR-3.0

Conflicts:
curator-client/pom.xml
curator-examples/pom.xml
curator-framework/pom.xml

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

curator-framework/src/main/java/org/apache/curator/framework/imps/DeleteBuilderImpl.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

curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkBackground.java
curator-recipes/pom.xml
curator-test/pom.xml
curator-x-discovery-server/pom.xml
curator-x-discovery/pom.xml
curator-x-rpc/pom.xml
pom.xml


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

Branch: refs/heads/CURATOR-299
Commit: 062a7d750788a187f1d41df0bf0a6a5926a78d3a
Parents: 8ef32cc 8499680
Author: randgalt 
Authored: Thu Mar 10 17:55:14 2016 -0500
Committer: randgalt 
Committed: Thu Mar 10 17:55:14 2016 -0500

--
 .../framework/api/BackgroundEnsembleable.java   |   2 +-
 .../api/BackgroundPathAndBytesable.java |   2 +-
 .../framework/api/BackgroundPathable.java   |   2 +-
 .../api/ErrorListenerEnsembleable.java  |  14 ++
 .../api/ErrorListenerMultiTransactionMain.java  |  16 ++
 .../api/ErrorListenerPathAndBytesable.java  |  14 ++
 .../framework/api/ErrorListenerPathable.java|  14 ++
 .../api/ErrorListenerReconfigBuilderMain.java   |  14 ++
 .../curator/framework/api/GetConfigBuilder.java |   2 +-
 .../curator/framework/api/ReconfigBuilder.java  |   2 +-
 .../transaction/CuratorMultiTransaction.java|   3 +-
 .../curator/framework/imps/Backgrounding.java   |  80 +--
 .../framework/imps/CreateBuilderImpl.java   | 236 ++-
 .../imps/CuratorMultiTransactionImpl.java   |  55 +++--
 .../framework/imps/DeleteBuilderImpl.java   |  84 ---
 .../framework/imps/ExistsBuilderImpl.java   |  63 ++---
 .../framework/imps/GetACLBuilderImpl.java   |  50 ++--
 .../framework/imps/GetChildrenBuilderImpl.java  |  60 +++--
 .../framework/imps/GetConfigBuilderImpl.java|  87 +++
 .../framework/imps/GetDataBuilderImpl.java  |  94 
 .../framework/imps/ReconfigBuilderImpl.java |  52 ++--
 .../imps/RemoveWatchesBuilderImpl.java  |  65 +++--
 .../framework/imps/SetACLBuilderImpl.java   |  66 --
 .../framework/imps/SetDataBuilderImpl.java  |  85 ---
 .../curator/framework/imps/SyncBuilderImpl.java |  56 +++--
 .../framework/imps/TestFrameworkBackground.java |  49 
 26 files changed, 791 insertions(+), 476 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/062a7d75/curator-framework/src/main/java/org/apache/curator/framework/api/BackgroundEnsembleable.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/api/BackgroundEnsembleable.java
index c8b323f,000..5f9703a
mode 100644,00..100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/api/BackgroundEnsembleable.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/api/BackgroundEnsembleable.java
@@@ -1,25 -1,0 +1,25 @@@
 +/**
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + *   http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License 

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

[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/f7ef2f1e
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f7ef2f1e
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/f7ef2f1e

Branch: refs/heads/CURATOR-299
Commit: f7ef2f1e040818f71e2b6a25646fb0e2868a3bb8
Parents: 88da05c 73cd00a
Author: randgalt 
Authored: Tue Mar 29 12:20:37 2016 -0500
Committer: randgalt 
Committed: Tue Mar 29 12:20:37 2016 -0500

--
 .../framework/recipes/nodes/PersistentNode.java |  6 +++-
 .../recipes/nodes/TestPersistentNode.java   | 31 
 2 files changed, 36 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/f7ef2f1e/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
--

http://git-wip-us.apache.org/repos/asf/curator/blob/f7ef2f1e/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentNode.java
--

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

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/062a7d75/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
index 58fae29,000..3d4e96d
mode 100644,00..100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
@@@ -1,322 -1,0 +1,335 @@@
 +/**
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + *   http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +package org.apache.curator.framework.imps;
 +
 +import org.apache.curator.RetryLoop;
 +import org.apache.curator.TimeTrace;
 +import org.apache.curator.framework.api.*;
 +import org.apache.curator.utils.DebugUtils;
 +import org.apache.zookeeper.AsyncCallback;
 +import org.apache.zookeeper.KeeperException;
 +import org.apache.zookeeper.Watcher;
 +import org.apache.zookeeper.Watcher.WatcherType;
 +import org.apache.zookeeper.ZooKeeper;
 +import java.util.concurrent.Callable;
 +import java.util.concurrent.Executor;
 +
 +
- public class RemoveWatchesBuilderImpl implements RemoveWatchesBuilder, 
RemoveWatchesType, RemoveWatchesLocal, BackgroundOperation
++public class RemoveWatchesBuilderImpl implements RemoveWatchesBuilder, 
RemoveWatchesType, RemoveWatchesLocal, BackgroundOperation, 
ErrorListenerPathable
 +{
 +private CuratorFrameworkImpl client;
 +private Watcher watcher;
 +private CuratorWatcher curatorWatcher;
 +private WatcherType watcherType;
 +private boolean guaranteed;
 +private boolean local;
 +private boolean quietly;
 +private Backgrounding backgrounding;
 +
 +public RemoveWatchesBuilderImpl(CuratorFrameworkImpl client)
 +{
 +this.client = client;
 +this.watcher = null;
 +this.curatorWatcher = null;
 +this.watcherType = WatcherType.Any;
 +this.guaranteed = false;
 +this.local = false;
 +this.quietly = false;
 +this.backgrounding = new Backgrounding();
 +}
 +
 +void internalRemoval(Watcher watcher, String path) throws Exception
 +{
 +this.watcher = watcher;
 +watcherType = WatcherType.Any;
 +quietly = true;
 +guaranteed = true;
 +if ( 
Boolean.getBoolean(DebugUtils.PROPERTY_REMOVE_WATCHERS_IN_FOREGROUND) )
 +{
 +this.backgrounding = new Backgrounding();
 +pathInForeground(path);
 +}
 +else
 +{
 +this.backgrounding = new Backgrounding(true);
 +pathInBackground(path);
 +}
 +}
 +
 +@Override
 +public RemoveWatchesType remove(Watcher watcher)
 +{
 +this.watcher = watcher;
 +this.curatorWatcher = null;
 +return this;
 +}
 +
 +@Override
 +public RemoveWatchesType remove(CuratorWatcher watcher)
 +{
 +this.watcher = null;
 +this.curatorWatcher = watcher;
 +return this;
 +}
 +
 +@Override
 +public RemoveWatchesType removeAll()
 +{
 +this.watcher = null;
 +this.curatorWatcher = null;
 +return this;
 +}
 +
 +@Override
 +public RemoveWatchesLocal ofType(WatcherType watcherType)
 +{
 +this.watcherType = watcherType;
 +
 +return this;
 +}
 +
 +@Override
- public Pathable inBackground(BackgroundCallback callback, Object 
context)
++public ErrorListenerPathable inBackground(BackgroundCallback 
callback, Object context)
 +{
 +backgrounding = new Backgrounding(callback, context);
 +return this;
 +}
 +
 +@Override
- public Pathable inBackground(BackgroundCallback callback, Object 
context, Executor executor)
++public ErrorListenerPathable inBackground(BackgroundCallback 
callback, Object context, Executor executor)
 +{
 +backgrounding = new Backgrounding(client, callback, context, 
executor);
 +return this;
 +}
 +
 +@Override
- public Pathable inBackground(BackgroundCallback 

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

[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/f7ef2f1e
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f7ef2f1e
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/f7ef2f1e

Branch: refs/heads/CURATOR-3.0
Commit: f7ef2f1e040818f71e2b6a25646fb0e2868a3bb8
Parents: 88da05c 73cd00a
Author: randgalt 
Authored: Tue Mar 29 12:20:37 2016 -0500
Committer: randgalt 
Committed: Tue Mar 29 12:20:37 2016 -0500

--
 .../framework/recipes/nodes/PersistentNode.java |  6 +++-
 .../recipes/nodes/TestPersistentNode.java   | 31 
 2 files changed, 36 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/f7ef2f1e/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
--

http://git-wip-us.apache.org/repos/asf/curator/blob/f7ef2f1e/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentNode.java
--

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

[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/88da05c0
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/88da05c0
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/88da05c0

Branch: refs/heads/CURATOR-3.0
Commit: 88da05c03caffd022737d382fde07271aedda9df
Parents: 062a7d7 3d1fca2
Author: randgalt 
Authored: Mon Mar 28 17:40:12 2016 -0500
Committer: randgalt 
Committed: Mon Mar 28 17:40:12 2016 -0500

--
 .../x/discovery/server/rest/DiscoveryResource.java |  2 +-
 .../org/apache/curator/x/discovery/ServiceType.java|  7 ++-
 .../x/discovery/details/ServiceDiscoveryImpl.java  | 13 -
 3 files changed, 19 insertions(+), 3 deletions(-)
--

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

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/062a7d75/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
index 58fae29,000..3d4e96d
mode 100644,00..100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/RemoveWatchesBuilderImpl.java
@@@ -1,322 -1,0 +1,335 @@@
 +/**
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + *   http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +package org.apache.curator.framework.imps;
 +
 +import org.apache.curator.RetryLoop;
 +import org.apache.curator.TimeTrace;
 +import org.apache.curator.framework.api.*;
 +import org.apache.curator.utils.DebugUtils;
 +import org.apache.zookeeper.AsyncCallback;
 +import org.apache.zookeeper.KeeperException;
 +import org.apache.zookeeper.Watcher;
 +import org.apache.zookeeper.Watcher.WatcherType;
 +import org.apache.zookeeper.ZooKeeper;
 +import java.util.concurrent.Callable;
 +import java.util.concurrent.Executor;
 +
 +
- public class RemoveWatchesBuilderImpl implements RemoveWatchesBuilder, 
RemoveWatchesType, RemoveWatchesLocal, BackgroundOperation
++public class RemoveWatchesBuilderImpl implements RemoveWatchesBuilder, 
RemoveWatchesType, RemoveWatchesLocal, BackgroundOperation, 
ErrorListenerPathable
 +{
 +private CuratorFrameworkImpl client;
 +private Watcher watcher;
 +private CuratorWatcher curatorWatcher;
 +private WatcherType watcherType;
 +private boolean guaranteed;
 +private boolean local;
 +private boolean quietly;
 +private Backgrounding backgrounding;
 +
 +public RemoveWatchesBuilderImpl(CuratorFrameworkImpl client)
 +{
 +this.client = client;
 +this.watcher = null;
 +this.curatorWatcher = null;
 +this.watcherType = WatcherType.Any;
 +this.guaranteed = false;
 +this.local = false;
 +this.quietly = false;
 +this.backgrounding = new Backgrounding();
 +}
 +
 +void internalRemoval(Watcher watcher, String path) throws Exception
 +{
 +this.watcher = watcher;
 +watcherType = WatcherType.Any;
 +quietly = true;
 +guaranteed = true;
 +if ( 
Boolean.getBoolean(DebugUtils.PROPERTY_REMOVE_WATCHERS_IN_FOREGROUND) )
 +{
 +this.backgrounding = new Backgrounding();
 +pathInForeground(path);
 +}
 +else
 +{
 +this.backgrounding = new Backgrounding(true);
 +pathInBackground(path);
 +}
 +}
 +
 +@Override
 +public RemoveWatchesType remove(Watcher watcher)
 +{
 +this.watcher = watcher;
 +this.curatorWatcher = null;
 +return this;
 +}
 +
 +@Override
 +public RemoveWatchesType remove(CuratorWatcher watcher)
 +{
 +this.watcher = null;
 +this.curatorWatcher = watcher;
 +return this;
 +}
 +
 +@Override
 +public RemoveWatchesType removeAll()
 +{
 +this.watcher = null;
 +this.curatorWatcher = null;
 +return this;
 +}
 +
 +@Override
 +public RemoveWatchesLocal ofType(WatcherType watcherType)
 +{
 +this.watcherType = watcherType;
 +
 +return this;
 +}
 +
 +@Override
- public Pathable inBackground(BackgroundCallback callback, Object 
context)
++public ErrorListenerPathable inBackground(BackgroundCallback 
callback, Object context)
 +{
 +backgrounding = new Backgrounding(callback, context);
 +return this;
 +}
 +
 +@Override
- public Pathable inBackground(BackgroundCallback callback, Object 
context, Executor executor)
++public ErrorListenerPathable inBackground(BackgroundCallback 
callback, Object context, Executor executor)
 +{
 +backgrounding = new Backgrounding(client, callback, context, 
executor);
 +return this;
 +}
 +
 +@Override
- public Pathable inBackground(BackgroundCallback 

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

[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/1f866815
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/1f866815
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/1f866815

Branch: refs/heads/CURATOR-3.0
Commit: 1f866815a82ff765f97895f9b6bb962b5b29e2a8
Parents: ec858f2 f02fb22
Author: randgalt 
Authored: Tue Feb 2 14:42:40 2016 -0500
Committer: randgalt 
Committed: Tue Feb 2 14:42:40 2016 -0500

--
 .../org/apache/curator/framework/recipes/cache/NodeCache.java  | 5 ++---
 .../org/apache/curator/framework/recipes/cache/TreeCache.java  | 1 +
 .../apache/curator/framework/recipes/cache/TreeCacheEvent.java | 6 ++
 .../apache/curator/framework/recipes/cache/TestTreeCache.java  | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/curator/blob/1f866815/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
--

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

[randgalt]

Merge branch 'master' into CURATOR-3.0

Conflicts:

curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java


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

Branch: refs/heads/CURATOR-3.0
Commit: 4e4072b08be2da21a656bd6a328ffbfb2efa6906
Parents: 1f86681 da9f5d0
Author: randgalt 
Authored: Tue Feb 2 16:48:37 2016 -0500
Committer: randgalt 
Committed: Tue Feb 2 16:48:37 2016 -0500

--
 .../framework/recipes/nodes/PersistentNode.java | 104 ---
 .../recipes/nodes/TestPersistentNode.java   |  46 
 2 files changed, 114 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/4e4072b0/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
index 93c88f7,c472fdd..d879d69
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
@@@ -173,44 -157,11 +173,11 @@@ public class PersistentNode implements 
  backgroundCallback = new BackgroundCallback()
  {
  @Override
 -public void processResult(CuratorFramework client, CuratorEvent 
event) throws Exception
 +public void processResult(CuratorFramework dummy, CuratorEvent 
event) throws Exception
  {
- if ( !isActive() )
 -if ( state.get() == State.STARTED )
++if ( isActive() )
  {
- return;
- }
- 
- String path = null;
- boolean nodeExists = false;
- if ( event.getResultCode() == 
KeeperException.Code.NODEEXISTS.intValue() )
- {
- path = event.getPath();
- nodeExists = true;
- }
- else if ( event.getResultCode() == 
KeeperException.Code.OK.intValue() )
- {
- path = event.getName();
- }
- else if ( event.getResultCode() == 
KeeperException.Code.NOAUTH.intValue() )
- {
- log.warn("Client does not have authorization to write 
node at path {}", event.getPath());
- authFailure.set(true);
- return;
- }
- if ( path != null )
- {
- authFailure.set(false);
- nodePath.set(path);
- watchNode();
- 
- if ( nodeExists )
- {
- 
client.setData().inBackground(setDataCallback).forPath(getActualPath(), 
getData());
- }
- else
- {
- initialisationComplete();
- }
+ processBackgroundCallback(event);
  }
  else
  {

http://git-wip-us.apache.org/repos/asf/curator/blob/4e4072b0/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentNode.java
--

curator git commit: Merge branch 'master' into CURATOR-3.0

[dragonsinth]

Repository: curator
Updated Branches:
  refs/heads/3.0-help [created] 6acf09871


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/6acf0987
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/6acf0987
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/6acf0987

Branch: refs/heads/3.0-help
Commit: 6acf0987125469ecb79ff48ce5e9735a98cd1abb
Parents: c6a22ba d124a0a
Author: Scott Blum 
Authored: Mon Feb 1 14:24:35 2016 -0500
Committer: Scott Blum 
Committed: Mon Feb 1 14:24:35 2016 -0500

--
 .../framework/recipes/cache/ChildData.java  | 22 +---
 .../recipes/cache/PathChildrenCache.java|  5 ++-
 .../framework/recipes/cache/TreeCache.java  | 38 ++--
 3 files changed, 32 insertions(+), 33 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/curator/blob/6acf0987/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
index a2f0e86,3f7d8d4..0ee1832
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
@@@ -303,10 -295,8 +302,8 @@@ public class TreeCache implements Close
  
  void wasDeleted() throws Exception
  {
- Stat oldStat = stat.getAndSet(null);
- byte[] oldData = data.getAndSet(null);
+ ChildData oldChildData = childData.getAndSet(null);
 -client.clearWatcherReferences(this);
 +
client.watches().remove(this).ofType(WatcherType.Any).locally().inBackground().forPath(path);
- 
  ConcurrentMap childMap = 
children.getAndSet(null);
  if ( childMap != null )
  {

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

[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/6acf0987
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/6acf0987
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/6acf0987

Branch: refs/heads/CURATOR-3.0
Commit: 6acf0987125469ecb79ff48ce5e9735a98cd1abb
Parents: c6a22ba d124a0a
Author: Scott Blum 
Authored: Mon Feb 1 14:24:35 2016 -0500
Committer: Scott Blum 
Committed: Mon Feb 1 14:24:35 2016 -0500

--
 .../framework/recipes/cache/ChildData.java  | 22 +---
 .../recipes/cache/PathChildrenCache.java|  5 ++-
 .../framework/recipes/cache/TreeCache.java  | 38 ++--
 3 files changed, 32 insertions(+), 33 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/curator/blob/6acf0987/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
index a2f0e86,3f7d8d4..0ee1832
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
@@@ -303,10 -295,8 +302,8 @@@ public class TreeCache implements Close
  
  void wasDeleted() throws Exception
  {
- Stat oldStat = stat.getAndSet(null);
- byte[] oldData = data.getAndSet(null);
+ ChildData oldChildData = childData.getAndSet(null);
 -client.clearWatcherReferences(this);
 +
client.watches().remove(this).ofType(WatcherType.Any).locally().inBackground().forPath(path);
- 
  ConcurrentMap childMap = 
children.getAndSet(null);
  if ( childMap != null )
  {

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

[randgalt]

Merge branch 'master' into CURATOR-3.0

Conflicts:

curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java


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

Branch: refs/heads/CURATOR-3.0
Commit: c6a22ba508f9227fe1c657f93e3cc77d8bc17e3e
Parents: d26c38d 649e0ba
Author: randgalt 
Authored: Mon Jan 18 21:05:41 2016 -0500
Committer: randgalt 
Committed: Mon Jan 18 21:05:41 2016 -0500

--
 .../framework/imps/NamespaceWatcherMap.java |  14 +-
 .../framework/imps/WatcherRemovalFacade.java|   2 +-
 .../framework/imps/WatcherRemovalManager.java   |   3 +-
 .../recipes/nodes/PersistentEphemeralNode.java  | 332 +-
 .../framework/recipes/nodes/PersistentNode.java | 436 +++
 .../src/site/confluence/group-member.confluence |   2 +-
 .../persistent-ephemeral-node.confluence|  20 +-
 .../nodes/TestPersistentEphemeralNode.java  |  22 +-
 .../TestPersistentEphemeralNodeListener.java|   1 +
 .../recipes/nodes/TestPersistentNode.java   |  63 +++
 10 files changed, 555 insertions(+), 340 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/c6a22ba5/curator-framework/src/main/java/org/apache/curator/framework/imps/NamespaceWatcherMap.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/imps/NamespaceWatcherMap.java
index 00618e6,e5aecb2..c864f44
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/NamespaceWatcherMap.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/NamespaceWatcherMap.java
@@@ -19,6 -19,6 +19,7 @@@
  package org.apache.curator.framework.imps;
  
  import com.google.common.annotations.VisibleForTesting;
++import com.google.common.cache.Cache;
  import com.google.common.cache.CacheBuilder;
  import org.apache.curator.framework.api.CuratorWatcher;
  import org.apache.zookeeper.Watcher;
@@@ -28,10 -28,10 +29,10 @@@ import java.util.concurrent.ConcurrentM
  
  class NamespaceWatcherMap implements Closeable
  {
--private final ConcurrentMap map = 
CacheBuilder.newBuilder()
++private final Cache cache = 
CacheBuilder.newBuilder()
  .weakValues()
--.build()
--.asMap();
++.build();
++private final ConcurrentMap map = cache.asMap();
  private final CuratorFrameworkImpl client;
  
  NamespaceWatcherMap(CuratorFrameworkImpl client)
@@@ -85,6 -74,6 +86,7 @@@
  @VisibleForTesting
  boolean isEmpty()
  {
++cache.cleanUp();
  return map.isEmpty();
  }
  
@@@ -103,4 -92,4 +105,10 @@@
  NamespaceWatcherexistingNamespaceWatcher = 
map.putIfAbsent(watcher, newNamespaceWatcher);
  return (existingNamespaceWatcher != null) ? existingNamespaceWatcher 
: newNamespaceWatcher;
  }
++
++@Override
++public String toString()
++{
++return map.toString();
++}
  }

http://git-wip-us.apache.org/repos/asf/curator/blob/c6a22ba5/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalFacade.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalFacade.java
index 91530b4,000..30a992e
mode 100644,00..100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalFacade.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalFacade.java
@@@ -1,198 -1,0 +1,198 @@@
 +/**
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + *   http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +
 +package 

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

[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/75325d4a
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/75325d4a
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/75325d4a

Branch: refs/heads/CURATOR-3.0
Commit: 75325d4aea8057607c7ee4a531b0c41f2bf2a6cb
Parents: ae8dc46 b08b543
Author: randgalt 
Authored: Mon Jan 18 18:04:41 2016 -0500
Committer: randgalt 
Committed: Mon Jan 18 18:04:41 2016 -0500

--
 .../java/org/apache/curator/utils/ZKPaths.java  |  2 +-
 .../framework/recipes/locks/TestLockACLs.java   | 50 
 2 files changed, 43 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/75325d4a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockACLs.java
--

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

[randgalt]

Merge branch 'master' into CURATOR-3.0

Conflicts:

curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java

curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java

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

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

curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java


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

Branch: refs/heads/CURATOR-3.0
Commit: ba38d4c5ea59466c4f1dcda6dadcab9bf3262257
Parents: 9a03ea9 5d485b0
Author: randgalt 
Authored: Mon Jan 18 15:57:02 2016 -0500
Committer: randgalt 
Committed: Mon Jan 18 15:57:02 2016 -0500

--
 .../framework/api/VersionPathAndBytesable.java  | 25 
 .../transaction/TransactionCreateBuilder.java   |  2 +
 .../transaction/TransactionSetDataBuilder.java  |  2 +
 .../framework/imps/CreateBuilderImpl.java   | 10 +--
 .../framework/imps/SetDataBuilderImpl.java  |  2 +-
 .../framework/imps/TestTransactionsOld.java | 46 +-
 .../recipes/cache/DefaultTreeCacheSelector.java | 37 +++
 .../framework/recipes/cache/TreeCache.java  | 39 +---
 .../recipes/cache/TreeCacheSelector.java| 66 
 .../framework/recipes/cache/TestTreeCache.java  | 57 +++--
 10 files changed, 264 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/ba38d4c5/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java
index cba0cba,f2ac146..d20c834
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java
@@@ -23,10 -24,10 +24,11 @@@ import org.apache.curator.framework.api
  import org.apache.curator.framework.api.CreateModable;
  import org.apache.curator.framework.api.PathAndBytesable;
  
 -public interface TransactionCreateBuilder extends
 -PathAndBytesable,
 -CreateModable,
 -ACLPathAndBytesable,
 -ACLCreateModePathAndBytesable,
 -Compressible  {
 +public interface TransactionCreateBuilder extends
 +PathAndBytesable,
 +CreateModable,
 +ACLPathAndBytesable,
++ACLCreateModePathAndBytesable,
 +Compressible
 +{
  }

http://git-wip-us.apache.org/repos/asf/curator/blob/ba38d4c5/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java
index 2d4d255,cc9e01c..84b25bb
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java
@@@ -20,11 -20,13 +20,13 @@@ package org.apache.curator.framework.ap
  
  import org.apache.curator.framework.api.Compressible;
  import org.apache.curator.framework.api.PathAndBytesable;
+ import org.apache.curator.framework.api.VersionPathAndBytesable;
  import org.apache.curator.framework.api.Versionable;
  
 -public interface TransactionSetDataBuilder extends
 -PathAndBytesable,
 -Versionable,
 -VersionPathAndBytesable,
 -Compressible
 +public interface TransactionSetDataBuilder extends
 +PathAndBytesable,
 +Versionable,
++VersionPathAndBytesable,
 +Compressible
  {
  }

http://git-wip-us.apache.org/repos/asf/curator/blob/ba38d4c5/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
index ada4bae,e11d74f..4d532ff
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
+++ 

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

[randgalt]

Merge branch 'master' into CURATOR-3.0

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

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

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

curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java

curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java

curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java

curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java


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

Branch: refs/heads/CURATOR-3.0
Commit: 9a03ea93937af047e8ad13c2e3e3559520abfb0a
Parents: 24aa3c3 36a72d9
Author: randgalt 
Authored: Sun Jan 17 17:40:52 2016 -0500
Committer: randgalt 
Committed: Sun Jan 17 17:40:52 2016 -0500

--
 .../org/apache/curator/ConnectionState.java |  4 ++
 .../apache/curator/CuratorZookeeperClient.java  |  2 +
 .../apache/curator/SessionFailRetryLoop.java|  2 +
 .../ClassicConnectionHandlingPolicy.java|  2 +
 .../StandardConnectionHandlingPolicy.java   |  2 +
 .../exhibitor/ExhibitorEnsembleProvider.java|  2 +
 .../org/apache/curator/utils/ThreadUtils.java   | 23 ++
 .../src/main/java/locking/LockingExample.java   |  7 ++-
 .../curator/framework/imps/Backgrounding.java   |  2 +
 .../framework/imps/CreateBuilderImpl.java   |  3 ++
 .../framework/imps/CuratorFrameworkImpl.java| 46 +---
 .../framework/imps/DeleteBuilderImpl.java   |  2 +
 .../framework/imps/FailedOperationManager.java  |  2 +
 .../FindAndDeleteProtectedNodeInBackground.java |  3 ++
 .../framework/imps/GetDataBuilderImpl.java  |  2 +
 .../curator/framework/imps/NamespaceImpl.java   |  2 +
 .../framework/imps/NamespaceWatcher.java|  2 +
 .../framework/imps/OperationAndData.java| 13 --
 .../framework/listen/ListenerContainer.java |  2 +
 .../framework/state/ConnectionStateManager.java | 14 +++---
 .../recipes/AfterConnectionEstablished.java |  1 +
 .../framework/recipes/cache/NodeCache.java  |  4 ++
 .../recipes/cache/PathChildrenCache.java|  4 ++
 .../framework/recipes/cache/TreeCache.java  |  7 +++
 .../framework/recipes/leader/LeaderLatch.java   |  5 +++
 .../recipes/leader/LeaderSelector.java  | 10 ++---
 .../framework/recipes/locks/ChildReaper.java|  1 +
 .../recipes/locks/InterProcessMultiLock.java|  4 ++
 .../recipes/locks/InterProcessSemaphore.java|  4 ++
 .../recipes/locks/InterProcessSemaphoreV2.java  |  2 +
 .../framework/recipes/locks/LockInternals.java  |  2 +
 .../curator/framework/recipes/locks/Reaper.java |  1 +
 .../framework/recipes/nodes/GroupMember.java|  3 ++
 .../recipes/nodes/PersistentEphemeralNode.java  |  3 ++
 .../recipes/queue/DistributedQueue.java | 43 ++
 .../framework/recipes/queue/QueueSharder.java   | 16 ---
 .../framework/recipes/shared/SharedValue.java   |  2 +
 ...estResetConnectionWithBackgroundFailure.java | 37 +++-
 .../curator/test/TestingZooKeeperMain.java  | 24 --
 .../entity/JsonServiceInstanceMarshaller.java   |  3 ++
 .../entity/JsonServiceInstancesMarshaller.java  |  2 +
 .../server/rest/DiscoveryResource.java  |  6 +++
 .../discovery/server/rest/InstanceCleanup.java  |  2 +
 .../discovery/details/ServiceDiscoveryImpl.java |  3 ++
 .../x/rpc/idl/discovery/DiscoveryService.java   |  8 
 .../idl/discovery/DiscoveryServiceLowLevel.java |  7 +++
 .../idl/services/CuratorProjectionService.java  | 25 +++
 47 files changed, 286 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/9a03ea93/curator-client/src/main/java/org/apache/curator/ConnectionState.java
--
diff --cc curator-client/src/main/java/org/apache/curator/ConnectionState.java
index 0b21643,dc6ac53..d79ec58
--- a/curator-client/src/main/java/org/apache/curator/ConnectionState.java
+++ b/curator-client/src/main/java/org/apache/curator/ConnectionState.java
@@@ -18,11 -18,11 +18,12 @@@
   */
  package org.apache.curator;
  
 -import org.apache.curator.utils.CloseableUtils;
 +import org.apache.curator.connection.ConnectionHandlingPolicy;
  import org.apache.curator.drivers.TracerDriver;
  import org.apache.curator.ensemble.EnsembleProvider;
 +import 

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

[randgalt]

Merge branch 'master' into CURATOR-3.0

Conflicts:

curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java


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

Branch: refs/heads/CURATOR-3.0
Commit: 598141892e571b075da01dbb972bf45aaf89e3ed
Parents: ac5c132 3862ada
Author: randgalt 
Authored: Thu Oct 22 17:59:30 2015 -0500
Committer: randgalt 
Committed: Thu Oct 22 17:59:30 2015 -0500

--
 .../curator/framework/EnsureContainers.java | 64 +
 .../framework/imps/TestEnsureContainers.java| 73 
 .../recipes/cache/PathChildrenCache.java| 13 ++--
 .../recipes/queue/SimpleDistributedQueue.java   | 13 ++--
 .../recipes/cache/TestPathChildrenCache.java| 23 +++---
 5 files changed, 166 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/59814189/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
index e4e18d9,3ee6b6d..e42db22
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
@@@ -27,7 -27,7 +27,8 @@@ import com.google.common.collect.Immuta
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
  import org.apache.curator.framework.CuratorFramework;
 +import org.apache.curator.framework.WatcherRemoveCuratorFramework;
+ import org.apache.curator.framework.EnsureContainers;
  import org.apache.curator.framework.api.BackgroundCallback;
  import org.apache.curator.framework.api.CuratorEvent;
  import org.apache.curator.framework.listen.ListenerContainer;

http://git-wip-us.apache.org/repos/asf/curator/blob/59814189/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 a4e2b2e,14d061f..8792044
--- 
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
@@@ -277,18 -300,18 +277,21 @@@ public class TestPathChildrenCache exte
  client.start();
  try
  {
--PathChildrenCache cache = new PathChildrenCache(client, 
"/one/two/three", false);
--cache.start();
--timing.sleepABit();
--
--try
++try ( PathChildrenCache cache = new PathChildrenCache(client, 
"/one/two/three", false) )
  {
--client.create().forPath("/one/two/three/four");
--}
--catch ( KeeperException.NoNodeException e )
--{
--Assert.fail("Path should exist", e);
++cache.start();
++timing.sleepABit();
++
++try
++{
++client.create().forPath("/one/two/three/four");
++}
++catch ( KeeperException.NoNodeException e )
++{
++Assert.fail("Path should exist", e);
++}
  }
++timing.sleepABit();
  }
  finally
  {

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

[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/ac5c1326
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ac5c1326
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ac5c1326

Branch: refs/heads/CURATOR-3.0
Commit: ac5c132684e8cf8f07741f12fefff39803925f99
Parents: 8ff8ab8 722d0ce
Author: randgalt 
Authored: Fri Oct 16 13:45:40 2015 -0500
Committer: randgalt 
Committed: Fri Oct 16 13:45:40 2015 -0500

--
 .../framework/CuratorFrameworkFactory.java  |  31 ++--
 .../framework/recipes/nodes/GroupMember.java| 154 +++
 .../recipes/nodes/PersistentEphemeralNode.java  |   7 +-
 .../src/site/confluence/group-member.confluence |  44 ++
 .../src/site/confluence/index.confluence|   3 +-
 .../recipes/nodes/TestGroupMember.java  |  86 +++
 6 files changed, 310 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/ac5c1326/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
--

http://git-wip-us.apache.org/repos/asf/curator/blob/ac5c1326/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
--

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

[cammckenzie]

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/1a240520
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/1a240520
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/1a240520

Branch: refs/heads/CURATOR-3.0
Commit: 1a240520f216801a5c2269956c86e92f15ed8f1b
Parents: c18 a14b277
Author: Cam McKenzie 
Authored: Thu Oct 15 13:28:37 2015 +1100
Committer: Cam McKenzie 
Committed: Thu Oct 15 13:28:37 2015 +1100

--
 .../java/org/apache/curator/framework/imps/SyncBuilderImpl.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/1a240520/curator-framework/src/main/java/org/apache/curator/framework/imps/SyncBuilderImpl.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/imps/SyncBuilderImpl.java
index cab31ae,09dfbae..be4d33a
mode 100644,100755..100755
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/SyncBuilderImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/SyncBuilderImpl.java

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

[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);
+ }
  }
  }

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

[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/df949e7a
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/df949e7a
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/df949e7a

Branch: refs/heads/CURATOR-3.0
Commit: df949e7a27e370d0e7f8013a7c7b0469382d1a2f
Parents: 537156d f4f2208
Author: randgalt 
Authored: Tue Oct 6 08:23:41 2015 -0500
Committer: randgalt 
Committed: Tue Oct 6 08:23:41 2015 -0500

--
 .../curator/framework/imps/NamespaceFacade.java |  6 ---
 .../curator/framework/imps/TestFramework.java   | 42 
 2 files changed, 42 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/df949e7a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
--

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

[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/ea36769a
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ea36769a
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ea36769a

Branch: refs/heads/CURATOR-3.0
Commit: ea36769afa77b510e2206d34faed17e6f4a57bd3
Parents: 64bb884 f8f05be
Author: randgalt 
Authored: Wed Sep 23 08:21:35 2015 -0500
Committer: randgalt 
Committed: Wed Sep 23 08:21:35 2015 -0500

--
 .../framework/imps/CreateBuilderImpl.java   | 24 ++--
 .../framework/imps/TestFrameworkEdges.java  | 41 
 2 files changed, 53 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/ea36769a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
--

http://git-wip-us.apache.org/repos/asf/curator/blob/ea36769a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
--

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

[mdrob]

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/24de710d
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/24de710d
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/24de710d

Branch: refs/heads/CURATOR-3.0
Commit: 24de710d249b82380028d429f22c56e12b3584e2
Parents: 73b05aa c8cc3f4
Author: Mike Drob 
Authored: Thu Sep 10 12:01:24 2015 -0500
Committer: Mike Drob 
Committed: Thu Sep 10 12:01:24 2015 -0500

--

--

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

[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/793ed89b
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/793ed89b
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/793ed89b

Branch: refs/heads/CURATOR-3.0
Commit: 793ed89b1d150166f24bfb7bf297a5c0fc707f1c
Parents: 75aa991 970bd39
Author: randgalt 
Authored: Tue Sep 8 19:53:32 2015 -0500
Committer: randgalt 
Committed: Tue Sep 8 19:53:32 2015 -0500

--
 .../recipes/nodes/PersistentEphemeralNode.java  | 15 
 .../nodes/TestPersistentEphemeralNode.java  | 39 
 .../queue/TestBoundedDistributedQueue.java  |  3 +-
 3 files changed, 55 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/793ed89b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
--

http://git-wip-us.apache.org/repos/asf/curator/blob/793ed89b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java
--

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

[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/d01eabe5
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d01eabe5
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d01eabe5

Branch: refs/heads/CURATOR-248
Commit: d01eabe5b3ff7624fa2bd423179316931d94c1e5
Parents: fed0bee 3801167
Author: randgalt 
Authored: Mon Aug 31 07:19:53 2015 -0700
Committer: randgalt 
Committed: Mon Aug 31 07:19:53 2015 -0700

--
 .../org/apache/curator/retry/RetryForever.java  | 60 
 .../java/org/apache/curator/TestRetryLoop.java  | 20 +++
 .../framework/recipes/cache/NodeCache.java  | 41 ++---
 curator-x-discovery-server/pom.xml  |  6 ++
 curator-x-discovery/pom.xml |  6 ++
 curator-x-rpc/pom.xml   |  6 ++
 6 files changed, 132 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/d01eabe5/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
index 49b9a3f,bfc27d8..8b70db1
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
@@@ -22,11 -22,10 +22,11 @@@ import com.google.common.annotations.Vi
  import com.google.common.base.Function;
  import com.google.common.base.Objects;
  import com.google.common.base.Preconditions;
+ 
  import org.apache.curator.framework.CuratorFramework;
 +import org.apache.curator.framework.WatcherRemoveCuratorFramework;
  import org.apache.curator.framework.api.BackgroundCallback;
  import org.apache.curator.framework.api.CuratorEvent;
- import org.apache.curator.framework.api.CuratorWatcher;
  import org.apache.curator.framework.listen.ListenerContainer;
  import org.apache.curator.framework.state.ConnectionState;
  import org.apache.curator.framework.state.ConnectionStateListener;
@@@ -170,10 -178,17 +179,18 @@@ public class NodeCache implements Close
  {
  if ( state.compareAndSet(State.STARTED, State.CLOSED) )
  {
 +client.removeWatchers();
  listeners.clear();
- }
- 
client.getConnectionStateListenable().removeListener(connectionStateListener);
+ client.clearWatcherReferences(watcher);
+ 
client.getConnectionStateListenable().removeListener(connectionStateListener);
+ 
+ // TODO
+ // From PathChildrenCache
+ // This seems to enable even more GC - I'm not sure why yet - it
+ // has something to do with Guava's cache and circular references
+ connectionStateListener = null;
+ watcher = null;
+ }
  }
  
  /**

http://git-wip-us.apache.org/repos/asf/curator/blob/d01eabe5/curator-x-discovery-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/d01eabe5/curator-x-discovery/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/d01eabe5/curator-x-rpc/pom.xml
--

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

[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/d01eabe5
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d01eabe5
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d01eabe5

Branch: refs/heads/CURATOR-247
Commit: d01eabe5b3ff7624fa2bd423179316931d94c1e5
Parents: fed0bee 3801167
Author: randgalt 
Authored: Mon Aug 31 07:19:53 2015 -0700
Committer: randgalt 
Committed: Mon Aug 31 07:19:53 2015 -0700

--
 .../org/apache/curator/retry/RetryForever.java  | 60 
 .../java/org/apache/curator/TestRetryLoop.java  | 20 +++
 .../framework/recipes/cache/NodeCache.java  | 41 ++---
 curator-x-discovery-server/pom.xml  |  6 ++
 curator-x-discovery/pom.xml |  6 ++
 curator-x-rpc/pom.xml   |  6 ++
 6 files changed, 132 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/d01eabe5/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
--
diff --cc 
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
index 49b9a3f,bfc27d8..8b70db1
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
@@@ -22,11 -22,10 +22,11 @@@ import com.google.common.annotations.Vi
  import com.google.common.base.Function;
  import com.google.common.base.Objects;
  import com.google.common.base.Preconditions;
+ 
  import org.apache.curator.framework.CuratorFramework;
 +import org.apache.curator.framework.WatcherRemoveCuratorFramework;
  import org.apache.curator.framework.api.BackgroundCallback;
  import org.apache.curator.framework.api.CuratorEvent;
- import org.apache.curator.framework.api.CuratorWatcher;
  import org.apache.curator.framework.listen.ListenerContainer;
  import org.apache.curator.framework.state.ConnectionState;
  import org.apache.curator.framework.state.ConnectionStateListener;
@@@ -170,10 -178,17 +179,18 @@@ public class NodeCache implements Close
  {
  if ( state.compareAndSet(State.STARTED, State.CLOSED) )
  {
 +client.removeWatchers();
  listeners.clear();
- }
- 
client.getConnectionStateListenable().removeListener(connectionStateListener);
+ client.clearWatcherReferences(watcher);
+ 
client.getConnectionStateListenable().removeListener(connectionStateListener);
+ 
+ // TODO
+ // From PathChildrenCache
+ // This seems to enable even more GC - I'm not sure why yet - it
+ // has something to do with Guava's cache and circular references
+ connectionStateListener = null;
+ watcher = null;
+ }
  }
  
  /**

http://git-wip-us.apache.org/repos/asf/curator/blob/d01eabe5/curator-x-discovery-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/d01eabe5/curator-x-discovery/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/d01eabe5/curator-x-rpc/pom.xml
--

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

[mdrob]

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/f9af0ce8
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f9af0ce8
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/f9af0ce8

Branch: refs/heads/CURATOR-3.0
Commit: f9af0ce81408f7a4cb4343fb0770e9e6ef545fda
Parents: 2fc9e37 061ed0a
Author: Mike Drob md...@apache.org
Authored: Mon Aug 24 07:10:20 2015 -0500
Committer: Mike Drob md...@apache.org
Committed: Mon Aug 24 07:10:20 2015 -0500

--
 .../org/apache/curator/ConnectionState.java | 26 +---
 .../framework/imps/TestBlockUntilConnected.java | 24 ++
 2 files changed, 36 insertions(+), 14 deletions(-)
--

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

[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/f9af0ce8
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f9af0ce8
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/f9af0ce8

Branch: refs/heads/CURATOR-247
Commit: f9af0ce81408f7a4cb4343fb0770e9e6ef545fda
Parents: 2fc9e37 061ed0a
Author: Mike Drob md...@apache.org
Authored: Mon Aug 24 07:10:20 2015 -0500
Committer: Mike Drob md...@apache.org
Committed: Mon Aug 24 07:10:20 2015 -0500

--
 .../org/apache/curator/ConnectionState.java | 26 +---
 .../framework/imps/TestBlockUntilConnected.java | 24 ++
 2 files changed, 36 insertions(+), 14 deletions(-)
--

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

[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/3016ce2f
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3016ce2f
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/3016ce2f

Branch: refs/heads/CURATOR-3.0
Commit: 3016ce2f49eb90cc01f9e3d41b94594853416965
Parents: 6d5136e 7f20986
Author: randgalt randg...@apache.org
Authored: Sat May 9 10:40:38 2015 -0500
Committer: randgalt randg...@apache.org
Committed: Sat May 9 10:40:38 2015 -0500

--
 .../main/java/discovery/InstanceDetails.java|  2 +-
 .../contexts/GenericDiscoveryContext.java   |  8 +--
 .../contexts/IntegerDiscoveryContext.java   |  4 +-
 .../server/contexts/StringDiscoveryContext.java |  4 +-
 .../entity/JsonServiceInstanceMarshaller.java   |  6 +-
 .../entity/JsonServiceInstancesMarshaller.java  |  8 +--
 .../entity/JsonServiceNamesMarshaller.java  |  8 +--
 .../discovery/server/rest/DiscoveryContext.java |  4 +-
 .../server/jetty_jersey/ServiceDetails.java |  4 +-
 curator-x-discovery/pom.xml | 14 +
 .../curator/x/discovery/ServiceInstance.java|  6 +-
 .../details/JsonInstanceSerializer.java |  4 +-
 curator-x-rpc/pom.xml   |  8 +++
 .../java/org/apache/curator/x/rpc/RpcTests.java |  6 +-
 pom.xml | 59 ++--
 src/site/confluence/compatibility.confluence|  9 +++
 src/site/site.xml   |  1 +
 17 files changed, 95 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/3016ce2f/curator-x-discovery/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/3016ce2f/curator-x-rpc/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/3016ce2f/pom.xml
--

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

[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/3016ce2f
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3016ce2f
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/3016ce2f

Branch: refs/heads/CURATOR-160
Commit: 3016ce2f49eb90cc01f9e3d41b94594853416965
Parents: 6d5136e 7f20986
Author: randgalt randg...@apache.org
Authored: Sat May 9 10:40:38 2015 -0500
Committer: randgalt randg...@apache.org
Committed: Sat May 9 10:40:38 2015 -0500

--
 .../main/java/discovery/InstanceDetails.java|  2 +-
 .../contexts/GenericDiscoveryContext.java   |  8 +--
 .../contexts/IntegerDiscoveryContext.java   |  4 +-
 .../server/contexts/StringDiscoveryContext.java |  4 +-
 .../entity/JsonServiceInstanceMarshaller.java   |  6 +-
 .../entity/JsonServiceInstancesMarshaller.java  |  8 +--
 .../entity/JsonServiceNamesMarshaller.java  |  8 +--
 .../discovery/server/rest/DiscoveryContext.java |  4 +-
 .../server/jetty_jersey/ServiceDetails.java |  4 +-
 curator-x-discovery/pom.xml | 14 +
 .../curator/x/discovery/ServiceInstance.java|  6 +-
 .../details/JsonInstanceSerializer.java |  4 +-
 curator-x-rpc/pom.xml   |  8 +++
 .../java/org/apache/curator/x/rpc/RpcTests.java |  6 +-
 pom.xml | 59 ++--
 src/site/confluence/compatibility.confluence|  9 +++
 src/site/site.xml   |  1 +
 17 files changed, 95 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/3016ce2f/curator-x-discovery/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/3016ce2f/curator-x-rpc/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/3016ce2f/pom.xml
--