[1/5] curator git commit: [maven-release-plugin] prepare release apache-curator-3.2.0-SNAPSHOT

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 bd0792376 -> c9b10d745


[maven-release-plugin] prepare release apache-curator-3.2.0-SNAPSHOT


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

Branch: refs/heads/CURATOR-3.0
Commit: 3dbc96716c95fb389833c8defc7fd83808099d50
Parents: bd07923
Author: Cam McKenzie 
Authored: Wed May 25 15:37:26 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 15:37: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/3dbc9671/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index d9bcf11..cbaea98 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.0-SNAPSHOT
+3.2.0
 
 
 curator-client
-3.2.0-SNAPSHOT
+3.2.0
 bundle
 
 Curator Client

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

http://git-wip-us.apache.org/repos/asf/curator/blob/3dbc9671/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 05fa37c..e84abf0 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.0-SNAPSHOT
+3.2.0
 
 
 curator-framework
-3.2.0-SNAPSHOT
+3.2.0
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/3dbc9671/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index c93e810..b0a99e0 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.2.0-SNAPSHOT
+3.2.0
 
 
 curator-recipes
-3.2.0-SNAPSHOT
+3.2.0
 bundle
 
 Curator Recipes

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

http://git-wip-us.apache.org/repos/asf/curator/blob/3dbc9671/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index 5c40a44..5d06d2a 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-SNAPSHOT
+3.2.0
 
 
 curator-x-discovery-server
-3.2.0-SNAPSHOT
+3.2.0
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/3dbc9671/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 43314c9..263569e 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-SNAPSHOT
+3.2.0
 
 
 curator-x-discovery
-3.2.0-SNAPSHOT
+3.2.0
 bundle
 
 Curator

[curator] Git Push Summary

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Tags:  refs/tags/apache-curator-3.2.0 [created] c0b83a110
  refs/tags/apache-curator-3.2.0-SNAPSHOT [created] 9b3b32797

[3/5] curator git commit: [maven-release-plugin] rollback the release of apache-curator-3.2.0-SNAPSHOT

2016-05-24 Thread cammckenzie 
[maven-release-plugin] rollback the release of apache-curator-3.2.0-SNAPSHOT


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

Branch: refs/heads/CURATOR-3.0
Commit: 897c1352afdb4b84d452009885d3415c6d494bac
Parents: 58187a4
Author: Cam McKenzie 
Authored: Wed May 25 15:38:04 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 15:38: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/897c1352/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 473f513..d9bcf11 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.2.0-SNAPSHOT
 
 
 curator-client
-3.2.1-SNAPSHOT
+3.2.0-SNAPSHOT
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/897c1352/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index d66db10..cdbd960 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.2.0-SNAPSHOT
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/897c1352/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index d6575cc..05fa37c 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.2.0-SNAPSHOT
 
 
 curator-framework
-3.2.1-SNAPSHOT
+3.2.0-SNAPSHOT
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/897c1352/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 17414c2..c93e810 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.2.0-SNAPSHOT
 
 
 curator-recipes
-3.2.1-SNAPSHOT
+3.2.0-SNAPSHOT
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/897c1352/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 292135e..ef84d51 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.2.0-SNAPSHOT
 
 
 curator-test
-3.2.1-SNAPSHOT
+3.2.0-SNAPSHOT
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/897c1352/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index 8766e9c..5c40a44 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.2.0-SNAPSHOT
 
 
 curator-x-discovery-server
-3.2.1-SNAPSHOT
+3.2.0-SNAPSHOT
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/897c1352/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index e2ded9a..43314c9 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.2.0-SNAPSHOT
 
 
 curator-x-discovery
-3.2.1-SNAPSHOT
+

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

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

Branch: refs/heads/CURATOR-3.0
Commit: c9b10d7453b6f3f3209aba0d088ec02ce72411ca
Parents: 7c2ed97
Author: Cam McKenzie 
Authored: Wed May 25 15:42:38 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 15:42:38 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/c9b10d74/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/c9b10d74/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/c9b10d74/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index e84abf0..d6575cc 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/c9b10d74/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index b0a99e0..17414c2 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/c9b10d74/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/c9b10d74/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/c9b10d74/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

[curator] Git Push Summary

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Tags:  refs/tags/apache-curator-3.2.0-SNAPSHOT [deleted] dfb7088f7

[1/2] curator git commit: CURATOR-306 - Fixed up test case that was broken as part of the addition of client schema validation.

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 2357123ca -> bd0792376


CURATOR-306 - Fixed up test case that was broken as part of the addition of 
client schema validation.


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

Branch: refs/heads/CURATOR-3.0
Commit: ee2f1e222072f5e7ce4e7c17db0b4fff3a2e7408
Parents: 637a0eb
Author: Cam McKenzie 
Authored: Wed May 25 15:30:29 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 15:30:29 2016 +1000

--
 .../framework/imps/TestFrameworkBackground.java | 25 ++--
 1 file changed, 23 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/ee2f1e22/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkBackground.java
--
diff --git 
a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkBackground.java
 
b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkBackground.java
index b9fd5c9..c62a299 100644
--- 
a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkBackground.java
+++ 
b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkBackground.java
@@ -40,6 +40,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
@@ -55,18 +57,37 @@ public class TestFrameworkBackground extends 
BaseClassForTests
 @Test
 public void testErrorListener() throws Exception
 {
+//The first call to the ACL provider will return a reasonable
+//value. The second will throw an error. This is because the ACL
+//provider is accessed prior to the backgrounding call.
+final AtomicBoolean aclProviderCalled = new AtomicBoolean(false);
+
 ACLProvider badAclProvider = new ACLProvider()
 {
 @Override
 public List getDefaultAcl()
 {
-throw new UnsupportedOperationException();
+if(aclProviderCalled.getAndSet(true))
+{
+throw new UnsupportedOperationException();
+}
+else
+{
+return new ArrayList<>();
+}
 }
 
 @Override
 public List getAclForPath(String path)
 {
-throw new UnsupportedOperationException();
+if(aclProviderCalled.getAndSet(true))
+{
+throw new UnsupportedOperationException();
+}
+else
+{
+return new ArrayList<>();
+}
 }
 };
 CuratorFramework client = CuratorFrameworkFactory.builder()

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

2016-05-24 Thread cammckenzie 
Merge branch 'CURATOR-306-fix' 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/bd079237
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/bd079237
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/bd079237

Branch: refs/heads/CURATOR-3.0
Commit: bd0792376b80de02c7524cb913065543885586ab
Parents: 2357123 ee2f1e2
Author: Cam McKenzie 
Authored: Wed May 25 15:32:52 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 15:32:52 2016 +1000

--
 .../framework/imps/TestFrameworkBackground.java | 25 ++--
 1 file changed, 23 insertions(+), 2 deletions(-)
--

[curator] Git Push Summary

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Tags:  refs/tags/apache-curator-3.2.0-SNAPSHOT [created] dfb7088f7

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

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

Branch: refs/heads/CURATOR-3.0
Commit: 2357123ca5ac98c2536cbdd87527bd404861d78d
Parents: 637a0eb
Author: Cam McKenzie 
Authored: Wed May 25 11:31:50 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 11:31:50 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/2357123c/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index cbaea98..d9bcf11 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.0-SNAPSHOT
 
 
 curator-client
-3.2.0
+3.2.0-SNAPSHOT
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/2357123c/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index c3ea3fe..cdbd960 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.0-SNAPSHOT
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/2357123c/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index e84abf0..05fa37c 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.0-SNAPSHOT
 
 
 curator-framework
-3.2.0
+3.2.0-SNAPSHOT
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/2357123c/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index b0a99e0..c93e810 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.0-SNAPSHOT
 
 
 curator-recipes
-3.2.0
+3.2.0-SNAPSHOT
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/2357123c/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index c357620..ef84d51 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.0-SNAPSHOT
 
 
 curator-test
-3.2.0
+3.2.0-SNAPSHOT
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/2357123c/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index 5d06d2a..5c40a44 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.0-SNAPSHOT
 
 
 curator-x-discovery-server
-3.2.0
+3.2.0-SNAPSHOT
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/2357123c/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 263569e..43314c9 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.0-SNAPSHOT
 
 
 curator-x-discovery
-3.2.0
+3.2.0-SNAPSHOT
 bundle
 
 Curator Service Discovery

[1/2] curator git commit: [maven-release-plugin] prepare release apache-curator-3.2.0-SNAPSHOT

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 5ff8aaae8 -> 2357123ca


[maven-release-plugin] prepare release apache-curator-3.2.0-SNAPSHOT


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

Branch: refs/heads/CURATOR-3.0
Commit: 637a0eb544bb5dd257e46ae1bf46d0292d55d955
Parents: 5ff8aaa
Author: Cam McKenzie 
Authored: Wed May 25 11:31:40 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 11:31:40 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/637a0eb5/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 91e2b14..cbaea98 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.1.1-SNAPSHOT
+3.2.0
 
 
 curator-client
-3.1.1-SNAPSHOT
+3.2.0
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/637a0eb5/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 9f27a50..c3ea3fe 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.curator
 apache-curator
-3.1.1-SNAPSHOT
+3.2.0
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/637a0eb5/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 45a90b6..e84abf0 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.1.1-SNAPSHOT
+3.2.0
 
 
 curator-framework
-3.1.1-SNAPSHOT
+3.2.0
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/637a0eb5/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 995689c..b0a99e0 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.1.1-SNAPSHOT
+3.2.0
 
 
 curator-recipes
-3.1.1-SNAPSHOT
+3.2.0
 bundle
 
 Curator Recipes

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

http://git-wip-us.apache.org/repos/asf/curator/blob/637a0eb5/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index 3470c1d..5d06d2a 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.1.1-SNAPSHOT
+3.2.0
 
 
 curator-x-discovery-server
-3.1.1-SNAPSHOT
+3.2.0
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/637a0eb5/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index c257ac3..263569e 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-3.1.1-SNAPSHOT
+3.2.0
 
 
 curator-x-discovery
-3.1.1-SNAPSHOT
+3.2.0
 bundle
 
 Curator

svn commit: r13774 - in /dev/curator/2.11.0: ./ apache-curator-2.11.0-source-release.zip apache-curator-2.11.0-source-release.zip.asc apache-curator-2.11.0-source-release.zip.md5 apache-curator-2.11.0

2016-05-24 Thread cammckenzie 
Author: cammckenzie
Date: Wed May 25 01:20:30 2016
New Revision: 13774

Log:
Curator 2.11.0 binaries

Added:
dev/curator/2.11.0/
dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip   (with props)
dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.asc   (with 
props)
dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.md5   (with 
props)
dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.sha1   (with 
props)

Added: dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip
==
Binary file - no diff available.

Propchange: dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip
--
svn:executable = *

Propchange: dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.asc
==
--- dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.asc (added)
+++ dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.asc Wed May 25 
01:20:30 2016
@@ -0,0 +1,18 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+Comment: GPGTools - https://gpgtools.org
+
+iQIcBAABCgAGBQJXRPPUAAoJEG17iHfZHfuJZdcP/2R48kO1eLGqFKSRkGTvkyC0
+uLGI+kq3T37WbmvHCHxUrc6FrWsnVzqs1VYCmUh/Eq5lwvy/9cBbYQuYYV6g2Tzh
+MeggMJ8OQwpdFWvDGMUS0nglFDpWN15tQ2UWvYFkoQvkP/ySwSEiLCF5TB3TszjN
+hpofMiubhN2gUpBxERTYt/rw//weO2lmZ2Nk6Mxsmp97ktUuatnDWE58b4btWjig
+w8KUUULrkRoxHk6H6YL0u+8ottqWSmCV5TJU8vEEjCAI9qN8jP0xszmeNUERV/mr
+fF+DpNDWJXFiB/VuCdp1/SwnjakTadZNVR40B3MluaXmPmYNQ8QIVlqsqEtMwbS6
+AC6XeqaKH//4g8l4tvbHNsXMOiBLuI8kM71snPCV8sV01MnK7HQCAul2OHPRthhY
+Qq4sCZ3KDZHN09XbY5muccOZKP0uZ93po5aWVYPsm6D8Fea7SH5jOnFzJDAEvyN2
+SSNa2hNpaXjeb7TpRmEVHgR+HgLMtaj0bCfqewOEny+8m+xWuVoZm3RxoRCYqMCR
+ySHM4wu32cZNSDVarFsLZiqPjpNtgx/ylRwEM0cYJqrjPPFaCCyeygoA0Q7jcSG7
+7fuINFNmtgdIMTM4Gb55681XOZDLoGcGADM1yqmh3SccdAQm/FqwZvzizBxuYEKu
+Dsh9+E/RXwruKm0CcB2h
+=rjpG
+-END PGP SIGNATURE-

Propchange: dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.asc
--
svn:executable = *

Added: dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.md5
==
--- dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.md5 (added)
+++ dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.md5 Wed May 25 
01:20:30 2016
@@ -0,0 +1 @@
+2f677bc86ea86aafb62eb2ed044b04ea
\ No newline at end of file

Propchange: dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.md5
--
svn:executable = *

Added: dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.sha1
==
--- dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.sha1 (added)
+++ dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.sha1 Wed May 25 
01:20:30 2016
@@ -0,0 +1 @@
+97accdb616dcfc9aa2b1e078935dd67068711373
\ No newline at end of file

Propchange: dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.sha1
--
svn:executable = *

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

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/master 8f281eb5b -> 4473c6b6c


[maven-release-plugin] prepare release apache-curator-2.11.0-SNAPSHOT


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

Branch: refs/heads/master
Commit: a5a242303f386ee6556c2fb880d70dc500805499
Parents: 8f281eb
Author: Cam McKenzie 
Authored: Wed May 25 09:13:57 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 09:13:57 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/a5a24230/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 4080eb5..e6e5a4e 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
 
 org.apache.curator
 apache-curator
-2.10.1-SNAPSHOT
+2.11.0
 
 
 curator-client
-2.10.1-SNAPSHOT
+2.11.0
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/a5a24230/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 21be8fd..c783342 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.curator
 apache-curator
-2.10.1-SNAPSHOT
+2.11.0
 
 
 curator-examples

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

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

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

http://git-wip-us.apache.org/repos/asf/curator/blob/a5a24230/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index b60b0a0..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.1-SNAPSHOT
+2.11.0
 
 
 curator-x-discovery-server
-2.10.1-SNAPSHOT
+2.11.0
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/a5a24230/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 7a0890f..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.1-SNAPSHOT
+2.11.0
 
 
 curator-x-discovery
-2.10.1-SNAPSHOT
+2.11.0

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

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

Branch: refs/heads/master
Commit: 4473c6b6c9dad81ca5db0021ea97c12a559b159c
Parents: a5a2423
Author: Cam McKenzie 
Authored: Wed May 25 09:14:07 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 09:14:07 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/4473c6b6/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index e6e5a4e..7413fe5 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.0-SNAPSHOT
 
 
 curator-client
-2.11.0
+2.11.0-SNAPSHOT
 bundle
 
 Curator Client

http://git-wip-us.apache.org/repos/asf/curator/blob/4473c6b6/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index c783342..a3af1a2 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.0-SNAPSHOT
 
 
 curator-examples

http://git-wip-us.apache.org/repos/asf/curator/blob/4473c6b6/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 130ee4e..0c8e44c 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.0-SNAPSHOT
 
 
 curator-framework
-2.11.0
+2.11.0-SNAPSHOT
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/4473c6b6/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 55f2023..8dc3c16 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.0-SNAPSHOT
 
 
 curator-recipes
-2.11.0
+2.11.0-SNAPSHOT
 bundle
 
 Curator Recipes

http://git-wip-us.apache.org/repos/asf/curator/blob/4473c6b6/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index d41c2a8..ad1d0ad 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.0-SNAPSHOT
 
 
 curator-test
-2.11.0
+2.11.0-SNAPSHOT
 
 Curator Testing
 Unit testing utilities.

http://git-wip-us.apache.org/repos/asf/curator/blob/4473c6b6/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index d8a6147..baef278 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.0-SNAPSHOT
 
 
 curator-x-discovery-server
-2.11.0
+2.11.0-SNAPSHOT
 bundle
 
 Curator Service Discovery Server

http://git-wip-us.apache.org/repos/asf/curator/blob/4473c6b6/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index c3039cb..003f59f 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.0-SNAPSHOT
 
 
 curator-x-discovery
-2.11.0
+2.11.0-SNAPSHOT
 bundle
 
 Curator Service Discovery

[1/3] curator git commit: Fixed CURATOR-329 - SharedValue.start() method does not update to current value if version of value currently stored in zookeeper is 0

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 20c6955b1 -> 5ff8aaae8


Fixed CURATOR-329 - SharedValue.start() method does not update to current value 
if version of value currently stored in zookeeper is 0


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

Branch: refs/heads/CURATOR-3.0
Commit: f12f35d0f78198e1f9f89a8cf3dafc7b07404220
Parents: d63e06e
Author: Algirdas Rascius 
Authored: Tue May 24 16:45:45 2016 +0300
Committer: Algirdas Rascius 
Committed: Tue May 24 16:45:45 2016 +0300

--
 .../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/f12f35d0/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
--
diff --git 
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
index 17a2943..dddc471 100644
--- 
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
@@ -44,6 +44,8 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 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;
@@ -91,7 +93,7 @@ public class SharedValue implements Closeable, 
SharedValueReader
 this.client = client;
 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/f12f35d0/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
--
diff --git 
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
index 659154a..a1f4d8c 100644
--- 
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
@@ -256,4 +256,31 @@ public class TestSharedCount extends BaseClassForTests
 CloseableUtils.closeQuietly(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);
+}
+}
 }

[2/3] curator git commit: Merge branch 'CURATOR-329' of https://github.com/ARascius/curator into CURATOR-329

2016-05-24 Thread cammckenzie 
Merge branch 'CURATOR-329' of https://github.com/ARascius/curator into 
CURATOR-329


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

Branch: refs/heads/CURATOR-3.0
Commit: 8f281eb5bf2d3d65f1c9c3dd1ea8d04188210f90
Parents: 6ae3f85 f12f35d
Author: Cam McKenzie 
Authored: Wed May 25 08:38:25 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 08:38:25 2016 +1000

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

[2/2] curator git commit: Merge branch 'CURATOR-329' of https://github.com/ARascius/curator into CURATOR-329

2016-05-24 Thread cammckenzie 
Merge branch 'CURATOR-329' of https://github.com/ARascius/curator into 
CURATOR-329


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

Branch: refs/heads/master
Commit: 8f281eb5bf2d3d65f1c9c3dd1ea8d04188210f90
Parents: 6ae3f85 f12f35d
Author: Cam McKenzie 
Authored: Wed May 25 08:38:25 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 08:38:25 2016 +1000

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

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

2016-05-24 Thread 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);
+ }
+ }
  }

[1/2] curator git commit: Fixed CURATOR-329 - SharedValue.start() method does not update to current value if version of value currently stored in zookeeper is 0

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/master 6ae3f8591 -> 8f281eb5b


Fixed CURATOR-329 - SharedValue.start() method does not update to current value 
if version of value currently stored in zookeeper is 0


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

Branch: refs/heads/master
Commit: f12f35d0f78198e1f9f89a8cf3dafc7b07404220
Parents: d63e06e
Author: Algirdas Rascius 
Authored: Tue May 24 16:45:45 2016 +0300
Committer: Algirdas Rascius 
Committed: Tue May 24 16:45:45 2016 +0300

--
 .../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/f12f35d0/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
--
diff --git 
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
index 17a2943..dddc471 100644
--- 
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
@@ -44,6 +44,8 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 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;
@@ -91,7 +93,7 @@ public class SharedValue implements Closeable, 
SharedValueReader
 this.client = client;
 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/f12f35d0/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
--
diff --git 
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
index 659154a..a1f4d8c 100644
--- 
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
@@ -256,4 +256,31 @@ public class TestSharedCount extends BaseClassForTests
 CloseableUtils.closeQuietly(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);
+}
+}
 }

[2/2] curator git commit: Merge branch 'CURATOR-329' of https://github.com/ARascius/curator into CURATOR-329

2016-05-24 Thread cammckenzie 
Merge branch 'CURATOR-329' of https://github.com/ARascius/curator into 
CURATOR-329


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

Branch: refs/heads/CURATOR-329
Commit: 8f281eb5bf2d3d65f1c9c3dd1ea8d04188210f90
Parents: 6ae3f85 f12f35d
Author: Cam McKenzie 
Authored: Wed May 25 08:38:25 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 08:38:25 2016 +1000

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

[1/2] curator git commit: Fixed CURATOR-329 - SharedValue.start() method does not update to current value if version of value currently stored in zookeeper is 0

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/CURATOR-329 [created] 8f281eb5b


Fixed CURATOR-329 - SharedValue.start() method does not update to current value 
if version of value currently stored in zookeeper is 0


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

Branch: refs/heads/CURATOR-329
Commit: f12f35d0f78198e1f9f89a8cf3dafc7b07404220
Parents: d63e06e
Author: Algirdas Rascius 
Authored: Tue May 24 16:45:45 2016 +0300
Committer: Algirdas Rascius 
Committed: Tue May 24 16:45:45 2016 +0300

--
 .../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/f12f35d0/curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
--
diff --git 
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
index 17a2943..dddc471 100644
--- 
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
@@ -44,6 +44,8 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 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;
@@ -91,7 +93,7 @@ public class SharedValue implements Closeable, 
SharedValueReader
 this.client = client;
 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/f12f35d0/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
--
diff --git 
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
index 659154a..a1f4d8c 100644
--- 
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
@@ -256,4 +256,31 @@ public class TestSharedCount extends BaseClassForTests
 CloseableUtils.closeQuietly(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);
+}
+}
 }

[1/3] curator git commit: CURATOR-262: Fixed integer overflow issue with sleepMs

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 6a245fb8d -> 20c6955b1


CURATOR-262: Fixed integer overflow issue with sleepMs


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

Branch: refs/heads/CURATOR-3.0
Commit: 630c009a410eff13c4428704700d566abe417bda
Parents: 33c19d6
Author: Dimitar Dyankov 
Authored: Thu Feb 25 16:23:38 2016 -0800
Committer: Dimitar Dyankov 
Committed: Thu Feb 25 16:23:38 2016 -0800

--
 .../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(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
 
b/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
index f31da61..3c9d3cd 100644
--- 
a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
+++ 
b/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
@@ -45,7 +45,7 @@ public class BoundedExponentialBackoffRetry extends 
ExponentialBackoffRetry
 }
 
 @Override
-protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
 {
 return Math.min(maxSleepTimeMs, super.getSleepTimeMs(retryCount, 
elapsedTimeMs));
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
 
b/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
index 1aed9a8..421e2b2 100644
--- 
a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
+++ 
b/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
@@ -65,10 +65,10 @@ public class ExponentialBackoffRetry extends SleepingRetry
 }
 
 @Override
-protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
 {
 // copied from Hadoop's RetryPolicies.java
-int sleepMs = baseSleepTimeMs * Math.max(1, random.nextInt(1 << 
(retryCount + 1)));
+long sleepMs = baseSleepTimeMs * Math.max(1, random.nextInt(1 << 
(retryCount + 1)));
 if ( sleepMs > maxSleepMs )
 {
 log.warn(String.format("Sleep extension too large (%d). Pinning to 
%d", sleepMs, maxSleepMs));

http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java 
b/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
index 6e0ff0e..234b241 100644
--- a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
+++ b/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
@@ -32,7 +32,7 @@ public class RetryNTimes extends SleepingRetry
 }
 
 @Override
-protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
 {
 return sleepMsBetweenRetries;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java 
b/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
index cd1953c..3b11268 100644
--- 
a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
+++ 
b/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
@@ -42,7 +42,7 @@ public class RetryUntilElapsed extends SleepingRetry

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

2016-05-24 Thread 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(-)
--

[1/2] curator git commit: CURATOR-262: Fixed integer overflow issue with sleepMs

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/master d63e06e84 -> 6ae3f8591


CURATOR-262: Fixed integer overflow issue with sleepMs


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

Branch: refs/heads/master
Commit: 630c009a410eff13c4428704700d566abe417bda
Parents: 33c19d6
Author: Dimitar Dyankov 
Authored: Thu Feb 25 16:23:38 2016 -0800
Committer: Dimitar Dyankov 
Committed: Thu Feb 25 16:23:38 2016 -0800

--
 .../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(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
 
b/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
index f31da61..3c9d3cd 100644
--- 
a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
+++ 
b/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
@@ -45,7 +45,7 @@ public class BoundedExponentialBackoffRetry extends 
ExponentialBackoffRetry
 }
 
 @Override
-protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
 {
 return Math.min(maxSleepTimeMs, super.getSleepTimeMs(retryCount, 
elapsedTimeMs));
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
 
b/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
index 1aed9a8..421e2b2 100644
--- 
a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
+++ 
b/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
@@ -65,10 +65,10 @@ public class ExponentialBackoffRetry extends SleepingRetry
 }
 
 @Override
-protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
 {
 // copied from Hadoop's RetryPolicies.java
-int sleepMs = baseSleepTimeMs * Math.max(1, random.nextInt(1 << 
(retryCount + 1)));
+long sleepMs = baseSleepTimeMs * Math.max(1, random.nextInt(1 << 
(retryCount + 1)));
 if ( sleepMs > maxSleepMs )
 {
 log.warn(String.format("Sleep extension too large (%d). Pinning to 
%d", sleepMs, maxSleepMs));

http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java 
b/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
index 6e0ff0e..234b241 100644
--- a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
+++ b/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
@@ -32,7 +32,7 @@ public class RetryNTimes extends SleepingRetry
 }
 
 @Override
-protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
 {
 return sleepMsBetweenRetries;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java 
b/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
index cd1953c..3b11268 100644
--- 
a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
+++ 
b/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
@@ -42,7 +42,7 @@ public class RetryUntilElapsed extends SleepingRetry
 }

[2/2] curator git commit: Merge branch 'CURATOR-262' of https://github.com/ddyankov/curator into CURATOR-262

2016-05-24 Thread cammckenzie 
Merge branch 'CURATOR-262' of https://github.com/ddyankov/curator into 
CURATOR-262


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

Branch: refs/heads/master
Commit: 6ae3f8591f5e2b31d4b53ac734df231b20408a5b
Parents: d63e06e 630c009
Author: Cam McKenzie 
Authored: Wed May 25 08:15:16 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 08:15:16 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(-)
--

[2/2] curator git commit: Merge branch 'CURATOR-262' of https://github.com/ddyankov/curator into CURATOR-262

2016-05-24 Thread cammckenzie 
Merge branch 'CURATOR-262' of https://github.com/ddyankov/curator into 
CURATOR-262


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

Branch: refs/heads/CURATOR-262
Commit: 6ae3f8591f5e2b31d4b53ac734df231b20408a5b
Parents: d63e06e 630c009
Author: Cam McKenzie 
Authored: Wed May 25 08:15:16 2016 +1000
Committer: Cam McKenzie 
Committed: Wed May 25 08:15:16 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(-)
--

[1/2] curator git commit: CURATOR-262: Fixed integer overflow issue with sleepMs

2016-05-24 Thread cammckenzie 
Repository: curator
Updated Branches:
  refs/heads/CURATOR-262 [created] 6ae3f8591


CURATOR-262: Fixed integer overflow issue with sleepMs


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

Branch: refs/heads/CURATOR-262
Commit: 630c009a410eff13c4428704700d566abe417bda
Parents: 33c19d6
Author: Dimitar Dyankov 
Authored: Thu Feb 25 16:23:38 2016 -0800
Committer: Dimitar Dyankov 
Committed: Thu Feb 25 16:23:38 2016 -0800

--
 .../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(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
 
b/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
index f31da61..3c9d3cd 100644
--- 
a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
+++ 
b/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
@@ -45,7 +45,7 @@ public class BoundedExponentialBackoffRetry extends 
ExponentialBackoffRetry
 }
 
 @Override
-protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
 {
 return Math.min(maxSleepTimeMs, super.getSleepTimeMs(retryCount, 
elapsedTimeMs));
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
 
b/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
index 1aed9a8..421e2b2 100644
--- 
a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
+++ 
b/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
@@ -65,10 +65,10 @@ public class ExponentialBackoffRetry extends SleepingRetry
 }
 
 @Override
-protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
 {
 // copied from Hadoop's RetryPolicies.java
-int sleepMs = baseSleepTimeMs * Math.max(1, random.nextInt(1 << 
(retryCount + 1)));
+long sleepMs = baseSleepTimeMs * Math.max(1, random.nextInt(1 << 
(retryCount + 1)));
 if ( sleepMs > maxSleepMs )
 {
 log.warn(String.format("Sleep extension too large (%d). Pinning to 
%d", sleepMs, maxSleepMs));

http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java 
b/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
index 6e0ff0e..234b241 100644
--- a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
+++ b/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
@@ -32,7 +32,7 @@ public class RetryNTimes extends SleepingRetry
 }
 
 @Override
-protected int getSleepTimeMs(int retryCount, long elapsedTimeMs)
+protected long getSleepTimeMs(int retryCount, long elapsedTimeMs)
 {
 return sleepMsBetweenRetries;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/630c009a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java 
b/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
index cd1953c..3b11268 100644
--- 
a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
+++ 
b/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
@@ -42,7 +42,7 @@ public class RetryUntilElapsed extends SleepingRetry