[2/3] curator git commit: [maven-release-plugin] prepare release apache-curator-2.11.0

2016-06-05 Thread cammckenzie 
[maven-release-plugin] prepare release apache-curator-2.11.0


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

Branch: refs/heads/master
Commit: 4332d5362cc6623a753811747124e570f1cd3740
Parents: a0ed33a
Author: Cam McKenzie 
Authored: Mon Jun 6 10:57:08 2016 +1000
Committer: Cam McKenzie 
Committed: Mon Jun 6 10:57:08 2016 +1000

--
 curator-client/pom.xml | 4 ++--
 curator-examples/pom.xml   | 2 +-
 curator-framework/pom.xml  | 4 ++--
 curator-recipes/pom.xml| 4 ++--
 curator-test/pom.xml   | 4 ++--
 curator-x-discovery-server/pom.xml | 4 ++--
 curator-x-discovery/pom.xml| 4 ++--
 curator-x-rpc/pom.xml  | 4 ++--
 pom.xml| 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/4332d536/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 9be19af..e6e5a4e 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10-0-SNAPSHOT
+2.11.0
 
 
 curator-client
-2.10-0-SNAPSHOT
+2.11.0
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/4332d536/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 4488f35..c783342 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.curator
 apache-curator
-2.10-0-SNAPSHOT
+2.11.0
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/4332d536/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index be89530..130ee4e 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10-0-SNAPSHOT
+2.11.0
 
 
 curator-framework
-2.10-0-SNAPSHOT
+2.11.0
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/4332d536/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index a3982ef..55f2023 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10-0-SNAPSHOT
+2.11.0
 
 
 curator-recipes
-2.10-0-SNAPSHOT
+2.11.0
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/4332d536/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 23e9f55..d41c2a8 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10-0-SNAPSHOT
+2.11.0
 
 
 curator-test
-2.10-0-SNAPSHOT
+2.11.0
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/4332d536/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index 58a55e7..d8a6147 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10-0-SNAPSHOT
+2.11.0
 
 
 curator-x-discovery-server
-2.10-0-SNAPSHOT
+2.11.0
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/4332d536/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 85ce859..c3039cb 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10-0-SNAPSHOT
+2.11.0
 
 
 curator-x-discovery
-2.10-0-SNAPSHOT
+2.11.0
 bundle
 
 Curator Service Discovery

[1/3] curator git commit: Back to 2.10.0

2016-06-05 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/master 8dc0283e0 -> 1cc120251


Back to 2.10.0


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

Branch: refs/heads/master
Commit: a0ed33ab39de2ebef43600e5411a3793d2ac0b25
Parents: 8dc0283
Author: Cam McKenzie 
Authored: Mon Jun 6 10:54:19 2016 +1000
Committer: Cam McKenzie 
Committed: Mon Jun 6 10:54:19 2016 +1000

--
 curator-client/pom.xml | 4 ++--
 curator-examples/pom.xml   | 2 +-
 curator-framework/pom.xml  | 4 ++--
 curator-recipes/pom.xml| 4 ++--
 curator-test/pom.xml   | 4 ++--
 curator-x-discovery-server/pom.xml | 4 ++--
 curator-x-discovery/pom.xml| 4 ++--
 curator-x-rpc/pom.xml  | 4 ++--
 pom.xml| 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/a0ed33ab/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 526ab4c..9be19af 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 
 
 curator-client
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/a0ed33ab/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 73b1dd2..4488f35 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/a0ed33ab/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 4565017..be89530 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 
 
 curator-framework
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/a0ed33ab/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index ac3b015..a3982ef 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 
 
 curator-recipes
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/a0ed33ab/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 44d695c..23e9f55 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 
 
 curator-test
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/a0ed33ab/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index bd07288..58a55e7 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 
 
 curator-x-discovery-server
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/a0ed33ab/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 7e6c3c1..85ce859 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT

[curator] Git Push Summary

2016-06-05 Thread cammckenzie 
Repository: curator
Updated Tags:  refs/tags/apache-curator-3.2.0 [deleted] f35ee177d

[curator] Git Push Summary

2016-06-05 Thread cammckenzie 
Repository: curator
Updated Tags:  refs/tags/apache-curator-2.11.0 [deleted] 2f81501f5

[09/13] curator git commit: Back to 3.1.0-SNAPSHOT

2016-06-05 Thread cammckenzie 
Back to 3.1.0-SNAPSHOT


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

Branch: refs/heads/CURATOR-3.0
Commit: b7c68f6f30f5474c3cc9a6958fdc011770da120e
Parents: e2200da
Author: Cam McKenzie 
Authored: Wed Jun 1 11:45:26 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 1 11:45:26 2016 +1000

--
 curator-client/pom.xml | 4 ++--
 curator-examples/pom.xml   | 2 +-
 curator-framework/pom.xml  | 4 ++--
 curator-recipes/pom.xml| 4 ++--
 curator-test/pom.xml   | 4 ++--
 curator-x-discovery-server/pom.xml | 4 ++--
 curator-x-discovery/pom.xml| 4 ++--
 curator-x-rpc/pom.xml  | 4 ++--
 pom.xml| 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/b7c68f6f/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 473f513..357d2d2 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 
 
 curator-client
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/b7c68f6f/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index d66db10..d5fb9ea 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.curator
 apache-curator
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/b7c68f6f/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 1a65898..a560365 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 
 
 curator-framework
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/b7c68f6f/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 0443adc..44e9f6b 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 
 
 curator-recipes
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/b7c68f6f/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 292135e..301ccef 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 
 
 curator-test
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/b7c68f6f/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index 8766e9c..a88b68c 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 
 
 curator-x-discovery-server
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/b7c68f6f/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index e2ded9a..62e7ebe 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 
 
 curator-x-discovery
-3.2.1-SNAPSHOT
+3.1.0-SNAPSHOT
 bundle
 
 Curator Service Discovery

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

2016-06-05 Thread 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) )
 +{
 +

[11/13] curator git commit: [maven-release-plugin] prepare for next development iteration

2016-06-05 Thread cammckenzie 
[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/CURATOR-3.0
Commit: a0dd0c95145de582c410eb39c462ce014b58a7c4
Parents: e7fa01c
Author: Cam McKenzie 
Authored: Wed Jun 1 11:51:04 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 1 11:51:04 2016 +1000

--
 curator-client/pom.xml | 4 ++--
 curator-examples/pom.xml   | 2 +-
 curator-framework/pom.xml  | 4 ++--
 curator-recipes/pom.xml| 4 ++--
 curator-test/pom.xml   | 4 ++--
 curator-x-discovery-server/pom.xml | 4 ++--
 curator-x-discovery/pom.xml| 4 ++--
 curator-x-rpc/pom.xml  | 4 ++--
 pom.xml| 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/a0dd0c95/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index cbaea98..473f513 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.0
+3.2.1-SNAPSHOT
 
 
 curator-client
-3.2.0
+3.2.1-SNAPSHOT
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/a0dd0c95/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index c3ea3fe..d66db10 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.curator
 apache-curator
-3.2.0
+3.2.1-SNAPSHOT
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/a0dd0c95/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index a50e64d..1a65898 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.0
+3.2.1-SNAPSHOT
 
 
 curator-framework
-3.2.0
+3.2.1-SNAPSHOT
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/a0dd0c95/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index e42519b..0443adc 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.0
+3.2.1-SNAPSHOT
 
 
 curator-recipes
-3.2.0
+3.2.1-SNAPSHOT
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/a0dd0c95/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index c357620..292135e 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.0
+3.2.1-SNAPSHOT
 
 
 curator-test
-3.2.0
+3.2.1-SNAPSHOT
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/a0dd0c95/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index 5d06d2a..8766e9c 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.0
+3.2.1-SNAPSHOT
 
 
 curator-x-discovery-server
-3.2.0
+3.2.1-SNAPSHOT
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/a0dd0c95/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 263569e..e2ded9a 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.0
+3.2.1-SNAPSHOT
 
 
 curator-x-discovery
-3.2.0
+3.2.1-SNAPSHOT
 bundle
 
 Curator Service Discovery

[06/13] curator git commit: Back to 2.10.0-SNAPSHOT

2016-06-05 Thread cammckenzie 
Back to 2.10.0-SNAPSHOT


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

Branch: refs/heads/CURATOR-3.0
Commit: 58555e49d77ed527d82a2dd28779ca80ca8678e2
Parents: 03310bb
Author: Cam McKenzie 
Authored: Wed Jun 1 10:37:28 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 1 10:37:28 2016 +1000

--
 curator-client/pom.xml | 4 ++--
 curator-examples/pom.xml   | 2 +-
 curator-framework/pom.xml  | 4 ++--
 curator-recipes/pom.xml| 4 ++--
 curator-test/pom.xml   | 4 ++--
 curator-x-discovery-server/pom.xml | 4 ++--
 curator-x-discovery/pom.xml| 4 ++--
 curator-x-rpc/pom.xml  | 4 ++--
 pom.xml| 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/58555e49/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index f25e331..2c02fcb 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10.0
+2.10.0-SNAPSHOT
 
 
 curator-client
-2.10.0
+2.10.0-SNAPSHOT
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/58555e49/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index f3a7840..78892c2 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.curator
 apache-curator
-2.10.0
+2.10.0-SNAPSHOT
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/58555e49/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index d71c7fa..dd05e29 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10.0
+2.10.0-SNAPSHOT
 
 
 curator-framework
-2.10.0
+2.10.0-SNAPSHOT
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/58555e49/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 5534a52..dfab08f 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10.0
+2.10.0-SNAPSHOT
 
 
 curator-recipes
-2.10.0
+2.10.0-SNAPSHOT
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/58555e49/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index ff7cd11..456a314 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10.0
+2.10.0-SNAPSHOT
 
 
 curator-test
-2.10.0
+2.10.0-SNAPSHOT
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/58555e49/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index 7f7a4c1..c1caca1 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10.0
+2.10.0-SNAPSHOT
 
 
 curator-x-discovery-server
-2.10.0
+2.10.0-SNAPSHOT
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/58555e49/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 7bcb64f..05d0eb7 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10.0
+2.10.0-SNAPSHOT
 
 
 curator-x-discovery
-2.10.0
+2.10.0-SNAPSHOT
 bundle
 
 Curator Service Discovery

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

[05/13] curator git commit: Back to 2.10.0

2016-06-05 Thread cammckenzie 
Back to 2.10.0


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

Branch: refs/heads/CURATOR-3.0
Commit: 03310bb2d77cf1d80332ca15a468e991f212fe2b
Parents: 53dca8a
Author: Cam McKenzie 
Authored: Wed Jun 1 10:36:17 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 1 10:36:17 2016 +1000

--
 curator-client/pom.xml | 4 ++--
 curator-examples/pom.xml   | 2 +-
 curator-framework/pom.xml  | 4 ++--
 curator-recipes/pom.xml| 4 ++--
 curator-test/pom.xml   | 4 ++--
 curator-x-discovery-server/pom.xml | 4 ++--
 curator-x-discovery/pom.xml| 4 ++--
 curator-x-rpc/pom.xml  | 4 ++--
 pom.xml| 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/03310bb2/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 526ab4c..f25e331 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10.0
 
 
 curator-client
-2.11.1-SNAPSHOT
+2.10.0
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/03310bb2/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 73b1dd2..f3a7840 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10.0
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/03310bb2/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 4565017..d71c7fa 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10.0
 
 
 curator-framework
-2.11.1-SNAPSHOT
+2.10.0
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/03310bb2/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index ac3b015..5534a52 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10.0
 
 
 curator-recipes
-2.11.1-SNAPSHOT
+2.10.0
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/03310bb2/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 44d695c..ff7cd11 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10.0
 
 
 curator-test
-2.11.1-SNAPSHOT
+2.10.0
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/03310bb2/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index bd07288..7f7a4c1 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10.0
 
 
 curator-x-discovery-server
-2.11.1-SNAPSHOT
+2.10.0
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/03310bb2/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 7e6c3c1..7bcb64f 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.10.0
 
 
 curator-x-discovery
-2.11.1-SNAPSHOT
+2.10.0
 bundle
 
 Curator Service Discovery

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

[02/13] curator git commit: [maven-release-plugin] prepare for next development iteration

2016-06-05 Thread cammckenzie 
[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/CURATOR-3.0
Commit: b0dd263e4cf8f2334fe6123bbf1f6f19407d6496
Parents: f540932
Author: Cam McKenzie 
Authored: Wed Jun 1 10:16:41 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 1 10:16:41 2016 +1000

--
 curator-client/pom.xml | 4 ++--
 curator-examples/pom.xml   | 2 +-
 curator-framework/pom.xml  | 4 ++--
 curator-recipes/pom.xml| 4 ++--
 curator-test/pom.xml   | 4 ++--
 curator-x-discovery-server/pom.xml | 4 ++--
 curator-x-discovery/pom.xml| 4 ++--
 curator-x-rpc/pom.xml  | 4 ++--
 pom.xml| 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/b0dd263e/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index e6e5a4e..526ab4c 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.0
+2.11.1-SNAPSHOT
 
 
 curator-client
-2.11.0
+2.11.1-SNAPSHOT
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/b0dd263e/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index c783342..73b1dd2 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.curator
 apache-curator
-2.11.0
+2.11.1-SNAPSHOT
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/b0dd263e/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 130ee4e..4565017 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.0
+2.11.1-SNAPSHOT
 
 
 curator-framework
-2.11.0
+2.11.1-SNAPSHOT
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/b0dd263e/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 55f2023..ac3b015 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.0
+2.11.1-SNAPSHOT
 
 
 curator-recipes
-2.11.0
+2.11.1-SNAPSHOT
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/b0dd263e/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index d41c2a8..44d695c 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.0
+2.11.1-SNAPSHOT
 
 
 curator-test
-2.11.0
+2.11.1-SNAPSHOT
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/b0dd263e/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index d8a6147..bd07288 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.0
+2.11.1-SNAPSHOT
 
 
 curator-x-discovery-server
-2.11.0
+2.11.1-SNAPSHOT
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/b0dd263e/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index c3039cb..7e6c3c1 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.0
+2.11.1-SNAPSHOT
 
 
 curator-x-discovery
-2.11.0
+2.11.1-SNAPSHOT
 bundle
 
 Curator Service Discovery

[12/13] curator git commit: If there is a network event after the semaphore's node is created but before getChildren() is called, the previous implementation would orphan the newly created node causin

2016-06-05 Thread cammckenzie 
If there is a network event after the semaphore's node is created but before 
getChildren() is called, the previous implementation would orphan the newly 
created node causing a deadlock later on


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

Branch: refs/heads/CURATOR-3.0
Commit: 8dc0283e02ed799d5d76303f370ccc6325662b83
Parents: 5584a61
Author: randgalt 
Authored: Thu Jun 2 17:27:18 2016 -0500
Committer: randgalt 
Committed: Thu Jun 2 17:27:18 2016 -0500

--
 .../recipes/locks/InterProcessSemaphoreV2.java  |  24 ++-
 .../locks/TestInterProcessSemaphore.java| 167 +--
 2 files changed, 173 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/8dc0283e/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
--
diff --git 
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
index 3d96be2..2b9d48d 100644
--- 
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
@@ -44,6 +44,7 @@ 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;
 
@@ -327,6 +328,9 @@ public class InterProcessSemaphoreV2
 RETRY_DUE_TO_MISSING_NODE
 }
 
+static volatile CountDownLatch debugAcquireLatch = null;
+static volatile CountDownLatch debugFailedGetChildrenLatch = null;
+
 private InternalAcquireResult 
internalAcquire1Lease(ImmutableList.Builder builder, long startMs, 
boolean hasWait, long waitMs) throws Exception
 {
 if ( client.getState() != CuratorFrameworkState.STARTED )
@@ -356,11 +360,29 @@ public class InterProcessSemaphoreV2
 String nodeName = ZKPaths.getNodeFromPath(path);
 lease = makeLease(path);
 
+if ( debugAcquireLatch != null )
+{
+debugAcquireLatch.await();
+}
+
 synchronized(this)
 {
 for(;;)
 {
-List children = 
client.getChildren().usingWatcher(watcher).forPath(leasesPath);
+List children;
+try
+{
+children = 
client.getChildren().usingWatcher(watcher).forPath(leasesPath);
+}
+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) )
 {
 log.error("Sequential path not found: " + path);

http://git-wip-us.apache.org/repos/asf/curator/blob/8dc0283e/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
index ad45d90..216c2a2 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
@@ -20,14 +20,19 @@
 package org.apache.curator.framework.recipes.locks;
 
 import com.google.common.collect.Lists;
-import org.apache.curator.framework.api.CuratorWatcher;
-import org.apache.curator.test.BaseClassForTests;
-import org.apache.curator.utils.CloseableUtils;
+import com.google.common.collect.Queues;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.framework.api.CuratorWatcher;
 import

[03/13] curator git commit: [maven-release-plugin] prepare release apache-curator-2.11.0

2016-06-05 Thread cammckenzie 
[maven-release-plugin] prepare release apache-curator-2.11.0


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

Branch: refs/heads/CURATOR-3.0
Commit: 28a500455a0c73f3d54bc4637d60afd9ff7fb31f
Parents: b0dd263
Author: Cam McKenzie 
Authored: Wed Jun 1 10:23:16 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 1 10:23:16 2016 +1000

--
 curator-client/pom.xml | 4 ++--
 curator-examples/pom.xml   | 2 +-
 curator-framework/pom.xml  | 4 ++--
 curator-recipes/pom.xml| 4 ++--
 curator-test/pom.xml   | 4 ++--
 curator-x-discovery-server/pom.xml | 4 ++--
 curator-x-discovery/pom.xml| 4 ++--
 curator-x-rpc/pom.xml  | 4 ++--
 pom.xml| 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/28a50045/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 526ab4c..e6e5a4e 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.11.0
 
 
 curator-client
-2.11.1-SNAPSHOT
+2.11.0
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/28a50045/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 73b1dd2..c783342 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.11.0
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/28a50045/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 4565017..130ee4e 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.11.0
 
 
 curator-framework
-2.11.1-SNAPSHOT
+2.11.0
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/28a50045/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index ac3b015..55f2023 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.11.0
 
 
 curator-recipes
-2.11.1-SNAPSHOT
+2.11.0
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/28a50045/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 44d695c..d41c2a8 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.11.0
 
 
 curator-test
-2.11.1-SNAPSHOT
+2.11.0
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/28a50045/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index bd07288..d8a6147 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.11.0
 
 
 curator-x-discovery-server
-2.11.1-SNAPSHOT
+2.11.0
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/28a50045/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 7e6c3c1..c3039cb 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.11.1-SNAPSHOT
+2.11.0
 
 
 curator-x-discovery
-2.11.1-SNAPSHOT
+2.11.0
 bundle
 
 Curator Service Discovery

curator git commit: If there is a network event after the semaphore's node is created but before getChildren() is called, the previous implementation would orphan the newly created node causing a dead

2016-06-05 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/master 5584a61cf -> 8dc0283e0


If there is a network event after the semaphore's node is created but before 
getChildren() is called, the previous implementation would orphan the newly 
created node causing a deadlock later on


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

Branch: refs/heads/master
Commit: 8dc0283e02ed799d5d76303f370ccc6325662b83
Parents: 5584a61
Author: randgalt 
Authored: Thu Jun 2 17:27:18 2016 -0500
Committer: randgalt 
Committed: Thu Jun 2 17:27:18 2016 -0500

--
 .../recipes/locks/InterProcessSemaphoreV2.java  |  24 ++-
 .../locks/TestInterProcessSemaphore.java| 167 +--
 2 files changed, 173 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/8dc0283e/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
--
diff --git 
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
index 3d96be2..2b9d48d 100644
--- 
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
@@ -44,6 +44,7 @@ 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;
 
@@ -327,6 +328,9 @@ public class InterProcessSemaphoreV2
 RETRY_DUE_TO_MISSING_NODE
 }
 
+static volatile CountDownLatch debugAcquireLatch = null;
+static volatile CountDownLatch debugFailedGetChildrenLatch = null;
+
 private InternalAcquireResult 
internalAcquire1Lease(ImmutableList.Builder builder, long startMs, 
boolean hasWait, long waitMs) throws Exception
 {
 if ( client.getState() != CuratorFrameworkState.STARTED )
@@ -356,11 +360,29 @@ public class InterProcessSemaphoreV2
 String nodeName = ZKPaths.getNodeFromPath(path);
 lease = makeLease(path);
 
+if ( debugAcquireLatch != null )
+{
+debugAcquireLatch.await();
+}
+
 synchronized(this)
 {
 for(;;)
 {
-List children = 
client.getChildren().usingWatcher(watcher).forPath(leasesPath);
+List children;
+try
+{
+children = 
client.getChildren().usingWatcher(watcher).forPath(leasesPath);
+}
+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) )
 {
 log.error("Sequential path not found: " + path);

http://git-wip-us.apache.org/repos/asf/curator/blob/8dc0283e/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
index ad45d90..216c2a2 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphore.java
@@ -20,14 +20,19 @@
 package org.apache.curator.framework.recipes.locks;
 
 import com.google.common.collect.Lists;
-import org.apache.curator.framework.api.CuratorWatcher;
-import org.apache.curator.test.BaseClassForTests;
-import org.apache.curator.utils.CloseableUtils;
+import com.google.common.collect.Queues;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
+import