[curator] Git Push Summary

2016-06-14 Thread cammckenzie
Repository: curator
Updated Tags:  refs/tags/apache-curator-3.2.0 [created] 5ac624bb9


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

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 37d2b2b0e -> 25ddaeb0d


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


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

Branch: refs/heads/CURATOR-3.0
Commit: b0cc815c8b87362e73d52822a6cedae75bf90a21
Parents: 37d2b2b
Author: Cam McKenzie 
Authored: Wed Jun 15 12:14:27 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 12:14:27 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/b0cc815c/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 473f513..cbaea98 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
 
 
 curator-client
-3.2.1-SNAPSHOT
+3.2.0
 bundle
 
 Curator Client

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

http://git-wip-us.apache.org/repos/asf/curator/blob/b0cc815c/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 1a65898..a50e64d 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
 
 
 curator-framework
-3.2.1-SNAPSHOT
+3.2.0
 bundle
 
 Curator Framework

http://git-wip-us.apache.org/repos/asf/curator/blob/b0cc815c/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 0443adc..e42519b 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
 
 
 curator-recipes
-3.2.1-SNAPSHOT
+3.2.0
 bundle
 
 Curator Recipes

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

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

http://git-wip-us.apache.org/repos/asf/curator/blob/b0cc815c/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index e2ded9a..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.1-SNAPSHOT
+3.2.0
 
 
 curator-x-discovery
-3.2.1-SNAPSHOT
+3.2.0
 bundle
 
 Curator Service 

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

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

Branch: refs/heads/CURATOR-3.0
Commit: 25ddaeb0d4bff11b07f522389081713313849331
Parents: b0cc815
Author: Cam McKenzie 
Authored: Wed Jun 15 12:14:37 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 12:14:37 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/25ddaeb0/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/25ddaeb0/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/25ddaeb0/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/25ddaeb0/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/25ddaeb0/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/25ddaeb0/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/25ddaeb0/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


[14/19] curator git commit: [maven-release-plugin] prepare release apache-curator-2.11.0

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

Branch: refs/heads/CURATOR-3.0
Commit: 269c9988377805b27db0c8d67218b330de367967
Parents: 3df4c49
Author: Cam McKenzie 
Authored: Wed Jun 15 09:53:36 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:53:36 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/269c9988/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/269c9988/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/269c9988/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/269c9988/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/269c9988/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/269c9988/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/269c9988/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


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

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

Branch: refs/heads/CURATOR-3.0
Commit: bec1781e8964c7e66a877d1c8abc361f96104e24
Parents: 269c998
Author: Cam McKenzie 
Authored: Wed Jun 15 09:53:46 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:53:46 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/bec1781e/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/bec1781e/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/bec1781e/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/bec1781e/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/bec1781e/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/bec1781e/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/bec1781e/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


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

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

Branch: refs/heads/CURATOR-3.0
Commit: c5e6e2c261734451eeadb440fb4272fad4cb1007
Parents: ce48143
Author: Cam McKenzie 
Authored: Wed Jun 15 09:20:58 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:20:58 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/c5e6e2c2/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/c5e6e2c2/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/c5e6e2c2/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/c5e6e2c2/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/c5e6e2c2/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/c5e6e2c2/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/c5e6e2c2/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


[16/19] curator git commit: #noissue - Fixed problem with test where the CHILD_ADDED event would fire for a non related zNode, causing the addedLatch to complete prematurely. This meant that the final

2016-06-14 Thread cammckenzie
 #noissue - Fixed problem with test where the CHILD_ADDED event would fire for 
a non related zNode, causing the addedLatch to complete prematurely. This meant 
that the final assertion in the test would fail.


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

Branch: refs/heads/CURATOR-3.0
Commit: d55585fd4652ba01ec0768e37a7996585a2c55fc
Parents: bec1781
Author: Cam McKenzie 
Authored: Wed Jun 15 11:09:31 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 11:09:31 2016 +1000

--
 .../recipes/cache/TestPathChildrenCache.java| 21 +++-
 1 file changed, 20 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/d55585fd/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
index 887df54..bf998ea 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
@@ -23,6 +23,8 @@ import com.google.common.collect.Lists;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.framework.api.UnhandledErrorListener;
+import org.apache.curator.framework.state.ConnectionState;
+import org.apache.curator.framework.state.ConnectionStateListener;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 import org.apache.curator.retry.RetryOneTime;
 import org.apache.curator.test.BaseClassForTests;
@@ -79,7 +81,8 @@ public class TestPathChildrenCache extends BaseClassForTests
 @Override
 public void childEvent(CuratorFramework client, 
PathChildrenCacheEvent event) throws Exception
 {
-if ( event.getType() == 
PathChildrenCacheEvent.Type.CHILD_ADDED )
+if ( event.getType() == 
PathChildrenCacheEvent.Type.CHILD_ADDED  &&
+ event.getData().getPath().equals("/baz"))
 {
 addedLatch.countDown();
 }
@@ -88,8 +91,24 @@ public class TestPathChildrenCache extends BaseClassForTests
 cache.getListenable().addListener(listener);
 cache.start();
 Assert.assertTrue(timing.awaitLatch(ensurePathLatch));
+
+final CountDownLatch connectedLatch = new CountDownLatch(1);
+client.getConnectionStateListenable().addListener(new 
ConnectionStateListener()
+{
+
+@Override
+public void stateChanged(CuratorFramework client, 
ConnectionState newState)
+{
+if(newState == ConnectionState.CONNECTED)
+{
+connectedLatch.countDown();
+}
+}
+});
 
 server = new TestingServer(serverPort, true);
+
+Assert.assertTrue(timing.awaitLatch(connectedLatch));
 
 client.create().creatingParentContainersIfNeeded().forPath("/baz", 
new byte[]{1, 2, 3});
 



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

2016-06-14 Thread cammckenzie
Merge branch 'master' into CURATOR-3.0

Conflicts:

curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java


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

Branch: refs/heads/CURATOR-3.0
Commit: d94a54f7814b4de90c95867a3495c0755ef3646c
Parents: 31a8241 6476773
Author: Cam McKenzie 
Authored: Wed Jun 15 08:41:29 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 08:41:29 2016 +1000

--
 .../framework/recipes/cache/TreeCache.java  |  2 +-
 .../framework/recipes/cache/TestTreeCache.java  | 51 ++--
 2 files changed, 48 insertions(+), 5 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/curator/blob/d94a54f7/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
--
diff --cc 
curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index b10df68,2d0ae83..62cf586
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@@ -21,8 -21,9 +21,9 @@@ package org.apache.curator.framework.re
  
  import com.google.common.collect.ImmutableSet;
  import org.apache.curator.framework.CuratorFramework;
 +import org.apache.curator.test.KillServerSession;
- import org.apache.curator.test.KillSession;
+ import org.apache.curator.framework.api.UnhandledErrorListener;
+ import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
 -import org.apache.curator.test.KillSession;
  import org.apache.curator.utils.CloseableUtils;
  import org.apache.zookeeper.CreateMode;
  import org.testng.Assert;



[02/19] curator git commit: Back to 2.10.0

2016-06-14 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/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/CURATOR-3.0
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-x-discovery
-2.11.1-SNAPSHOT
+2.10-0-SNAPSHOT
 bundle
 
 Curator 

[01/19] curator git commit: [CURATOR-331] Make unhandledErrorListenable in TreeCache

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 31a824198 -> 37d2b2b0e


[CURATOR-331] Make unhandledErrorListenable in TreeCache


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

Branch: refs/heads/CURATOR-3.0
Commit: 7ae8c2da7eb401e376030643770d408fdeaa8239
Parents: 5584a61
Author: Julie Kim 
Authored: Sat Jun 4 17:30:19 2016 +0900
Committer: Julie Kim 
Committed: Sat Jun 4 17:30:19 2016 +0900

--
 .../framework/recipes/cache/TreeCache.java  |  2 +-
 .../framework/recipes/cache/TestTreeCache.java  | 50 ++--
 2 files changed, 48 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/7ae8c2da/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--
diff --git 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
index 914d336..95b8b99 100644
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
@@ -633,7 +633,7 @@ public class TreeCache implements Closeable
  * TODO: consider making public.
  */
 @VisibleForTesting
-Listenable getUnhandledErrorListenable()
+public Listenable getUnhandledErrorListenable()
 {
 return errorListeners;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/7ae8c2da/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index 2cf9e70..2d0ae83 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,12 +21,15 @@ package org.apache.curator.framework.recipes.cache;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.api.UnhandledErrorListener;
+import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
 import org.apache.curator.test.KillSession;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.zookeeper.CreateMode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class TestTreeCache extends BaseTestTreeCache
 {
@@ -567,4 +570,45 @@ public class TestTreeCache extends BaseTestTreeCache
 assertEvent(TreeCacheEvent.Type.NODE_ADDED, "/test");
 assertNoMoreEvents();
 }
+
+@Test
+public void testErrorListener() throws Exception
+{
+client.create().forPath("/test");
+
+cache = buildWithListeners(TreeCache.newBuilder(client, "/test"));
+
+// Register a listener that throws an exception for the event
+cache.getListenable().addListener(new TreeCacheListener()
+{
+@Override
+public void childEvent(CuratorFramework client, TreeCacheEvent 
event) throws Exception
+{
+if (event.getType() == Type.NODE_UPDATED) {
+throw new RuntimeException("Test Exception");
+}
+}
+});
+
+cache.getUnhandledErrorListenable().removeListener(errorListener);
+final AtomicBoolean isProcessed = new AtomicBoolean(false);
+cache.getUnhandledErrorListenable().addListener(new 
UnhandledErrorListener()
+{
+@Override
+public void unhandledError(String message, Throwable e)
+{
+Assert.assertFalse(isProcessed.compareAndSet(false, true));
+   

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

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

Branch: refs/heads/CURATOR-3.0
Commit: 3df4c493e51a3e2fc1449050d18f615b67cae676
Parents: 3374248
Author: Cam McKenzie 
Authored: Wed Jun 15 09:34:59 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:34:59 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/3df4c493/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/3df4c493/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/3df4c493/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/3df4c493/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/3df4c493/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/3df4c493/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/3df4c493/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/19] curator git commit: [maven-release-plugin] prepare release apache-curator-2.11.0

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

Branch: refs/heads/CURATOR-3.0
Commit: 337424801b9b20ed3d2f655629ccdb242a19bce5
Parents: 882437c
Author: Cam McKenzie 
Authored: Wed Jun 15 09:34:13 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:34:13 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/33742480/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/33742480/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/33742480/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/33742480/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/33742480/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/33742480/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/33742480/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


[08/19] curator git commit: [maven-release-plugin] prepare release apache-curator-2.11.0

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

Branch: refs/heads/CURATOR-3.0
Commit: ce48143a77364c63405a891649ecb48f23fcdf2b
Parents: 2bac78c
Author: Cam McKenzie 
Authored: Wed Jun 15 09:18:49 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:18:49 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/ce48143a/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 2c02fcb..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/ce48143a/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 78892c2..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/ce48143a/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index dd05e29..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/ce48143a/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index dfab08f..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/ce48143a/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 456a314..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/ce48143a/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index c1caca1..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/ce48143a/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 05d0eb7..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


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

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

Branch: refs/heads/CURATOR-3.0
Commit: 1cc12025169fa0d625663780b33d0036ff837f00
Parents: 4332d53
Author: Cam McKenzie 
Authored: Mon Jun 6 10:57:18 2016 +1000
Committer: Cam McKenzie 
Committed: Mon Jun 6 10:57:18 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/1cc12025/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/1cc12025/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/1cc12025/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/1cc12025/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/1cc12025/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/1cc12025/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/1cc12025/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


[10/19] curator git commit: # noissue - Fixed license header.

2016-06-14 Thread cammckenzie
 # noissue - Fixed license header.


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

Branch: refs/heads/CURATOR-3.0
Commit: 882437cb8a477590024863c8356ac272b377f75e
Parents: c5e6e2c
Author: Cam McKenzie 
Authored: Wed Jun 15 09:21:34 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:21:34 2016 +1000

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


http://git-wip-us.apache.org/repos/asf/curator/blob/882437cb/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index 2d0ae83..d3c6c15 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY



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

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

Branch: refs/heads/CURATOR-3.0
Commit: 1f411fc132be0512add75c1a6b79511c08e2feaa
Parents: d2b94e1
Author: Cam McKenzie 
Authored: Wed Jun 15 11:13:10 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 11:13:10 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/1f411fc1/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/1f411fc1/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/1f411fc1/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/1f411fc1/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/1f411fc1/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/1f411fc1/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/1f411fc1/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


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

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

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

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


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



[05/19] curator git commit: Merge branch 'CURATOR-331' of https://github.com/julnamoo/curator into CURATOR-331

2016-06-14 Thread cammckenzie
Merge branch 'CURATOR-331' of https://github.com/julnamoo/curator into 
CURATOR-331


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

Branch: refs/heads/CURATOR-3.0
Commit: 64767734acfa7908f27cb77a61db87ce1dea9372
Parents: 1cc1202 7ae8c2d
Author: Cam McKenzie 
Authored: Wed Jun 15 08:34:49 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 08:34:49 2016 +1000

--
 .../framework/recipes/cache/TreeCache.java  |  2 +-
 .../framework/recipes/cache/TestTreeCache.java  | 50 ++--
 2 files changed, 48 insertions(+), 4 deletions(-)
--




[17/19] curator git commit: [maven-release-plugin] prepare release apache-curator-2.11.0

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

Branch: refs/heads/CURATOR-3.0
Commit: d2b94e1139c26613bc225f9d2ca69c8642125cfd
Parents: d55585f
Author: Cam McKenzie 
Authored: Wed Jun 15 11:13:00 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 11:13:00 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/d2b94e11/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/d2b94e11/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/d2b94e11/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/d2b94e11/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/d2b94e11/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/d2b94e11/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/d2b94e11/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


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

2016-06-14 Thread cammckenzie
Merge branch 'master' into CURATOR-3.0

Conflicts:

curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java


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

Branch: refs/heads/CURATOR-3.0
Commit: 37d2b2b0e1e22d9ab674ecba2a223ff6fcaa825f
Parents: d828dc0 1f411fc
Author: Cam McKenzie 
Authored: Wed Jun 15 12:10:44 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 12:10:44 2016 +1000

--
 .../recipes/cache/TestPathChildrenCache.java| 21 +++-
 1 file changed, 20 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/37d2b2b0/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
--
diff --cc 
curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
index 49cbb4c,bf998ea..a09c878
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
@@@ -23,7 -23,9 +23,9 @@@ import com.google.common.collect.Lists
  import org.apache.curator.framework.CuratorFramework;
  import org.apache.curator.framework.CuratorFrameworkFactory;
  import org.apache.curator.framework.api.UnhandledErrorListener;
 +import org.apache.curator.framework.imps.TestCleanState;
+ import org.apache.curator.framework.state.ConnectionState;
+ import org.apache.curator.framework.state.ConnectionStateListener;
 -import org.apache.curator.retry.ExponentialBackoffRetry;
  import org.apache.curator.retry.RetryOneTime;
  import org.apache.curator.test.BaseClassForTests;
  import org.apache.curator.test.ExecuteCalledWatchingExecutorService;



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

2016-06-14 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/CURATOR-3.0
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


svn commit: r14007 - 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-so

2016-06-14 Thread cammckenzie
Author: cammckenzie
Date: Wed Jun 15 02:07:36 2016
New Revision: 14007

Log:
Updating 2.11.0 binaries.

Modified:
dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip
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.md5
dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.sha1

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

Modified: 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 (original)
+++ dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.asc Wed Jun 15 
02:07:36 2016
@@ -2,17 +2,17 @@
 Version: GnuPG v1
 Comment: GPGTools - https://gpgtools.org
 
-iQIcBAABCgAGBQJXVMu0AAoJEG17iHfZHfuJYB0P/Ampy7c69jxxSL66zyVQDl0z
-oXwiqijj0Qfq9yP1xehxWKFRSM6QouAeo5//nH2+xC3ODEpg/e0tn+kB8B+O6njM
-nEinsJHMcmgUht3Nc4Jh7eNUXgRxPtq8UBcZX7dS6167mulWFaPWTYP1DPRM9M/4
-EiIuinmhJyLSTzhmM5+3TmAYLAGvbTt4+aiR3EjOh0Grxig9VGimLLm6Kp36kWrt
-B0qap5y2r4+mHHOutZUPspaIdG44Ep779rAzQcFtzW+19OtT2Ksrr9eN7OyP48XF
-l/Y3MIxUaueXhLsEdMOgrYJmn8BPVfyo1ck8FNdA0v1wrmIkio8dmMRbBfnhC8rD
-72Yij/fYkejkRT+2QI4WKd3wkc5GvDQVvqZEpTqRBmP6czvdEmOgsPE9G00wM5QZ
-HwMH4o/I8T7JdmiBXLO5w+ii4MWH/plt4ZON++X4uWWfSare97O2bl8qCNttuOlE
-JQq8h2f5R9fDvcGR7+DCNibOZKVOne2r5pJgY8pHHDXVoHJ8mH2iegEbfVNWryK6
-t9vlmmtO2+rarR8OccD45zodgQe5w18jZVa+zoNbQu7thAOUclWGDhjm29jzZdEj
-rvM2/LJMiyRernvPl+/SHWF9yzTiPR6Y26BEhLASYtlaMjzbRclBiZF0LyZEuAih
-Qk3KnV7LO2BsoeWfBLZL
-=b089
+iQIcBAABCgAGBQJXYK14AAoJEG17iHfZHfuJaVcP/R3eB8GCIwG28zZPw71LHjzs
+WgUGR1b0MwmMnPVdWgEPtm6TWC8LUHx720HJTY4e3/t828KFulonmH1cl5Pcv24F
+OW9HyngH7+xH2bBBqp5VWcwM5wGN9YNL/mLMaqM2GqAUoW6mMa7pps9/TRym+MQ9
+19v1LPv28TSQlDcLq7+KrXQ6zsTzpL4QU6K9pS+cSKvIBMflBP/tvmwhib+1egIh
+/bJR1wnmdw8VbagTY6kVjsXB42bIoK0/trWAkUczdnJpKbh7Fq5Mlyh9BkT9GrW6
+69nwtB4g5e5blbYxK+dGzm6fBgE1ADpeO6gIFYWS8JlBCb1+ksFycvMtf2gFZ3Ha
+Ls6OexZiBDFhwTi4EsDYGN9+MH4WrCtnTcO7XSuZfgFrhHgFZ0vHVwUiTq2SQSSb
+gYobzx95gWDKk4GZpckQ4NkQvu1gQskfetUlceV2/CKKq5UAegCZ/6yNodgUsIgb
+Ftv6VYrUM1nibdUQWCo8dAx3QHLaSFNFskl9T0OVvyDgmSsGwNa7xHCmvETuTdrt
+gQ+6Lxpd+ucA5mn/i2OibDm0OomhCMzlCt9KDsKfiEO1n1xeBRYmB+qDxibbJkjG
+V76r66JmuYjeUPIJPOM+i75yr0/t2XeEvhwxHvmya61DN5dTfmkAnk/WhvgGM6dw
+sf14xaJQgq+sVaGOYEaS
+=9YPC
 -END PGP SIGNATURE-

Modified: 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 (original)
+++ dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.md5 Wed Jun 15 
02:07:36 2016
@@ -1 +1 @@
-0a1088dd0885e1c60f0fa203c56e898e
\ No newline at end of file
+bd0ee5251e08829db6433e72ec78a77f
\ No newline at end of file

Modified: 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 (original)
+++ dev/curator/2.11.0/apache-curator-2.11.0-source-release.zip.sha1 Wed Jun 15 
02:07:36 2016
@@ -1 +1 @@
-1913b47e0f8318e8c7a86a08f2093546b149eb6e
\ No newline at end of file
+a24b9447db49532eb81e0f1cc65abc35d2b40c81
\ No newline at end of file




[curator] Git Push Summary

2016-06-14 Thread cammckenzie
Repository: curator
Updated Tags:  refs/tags/apache-curator-2.11.0 [created] 9ac3980e0


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

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

Branch: refs/heads/master
Commit: 1f411fc132be0512add75c1a6b79511c08e2feaa
Parents: d2b94e1
Author: Cam McKenzie 
Authored: Wed Jun 15 11:13:10 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 11:13:10 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/1f411fc1/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/1f411fc1/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/1f411fc1/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/1f411fc1/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/1f411fc1/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/1f411fc1/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/1f411fc1/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


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

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/master d55585fd4 -> 1f411fc13


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

Branch: refs/heads/master
Commit: d2b94e1139c26613bc225f9d2ca69c8642125cfd
Parents: d55585f
Author: Cam McKenzie 
Authored: Wed Jun 15 11:13:00 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 11:13:00 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/d2b94e11/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/d2b94e11/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/d2b94e11/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/d2b94e11/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/d2b94e11/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/d2b94e11/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/d2b94e11/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] Git Push Summary

2016-06-14 Thread cammckenzie
Repository: curator
Updated Tags:  refs/tags/apache-curator-2.11.0 [deleted] c715cd02a


curator git commit: #noissue - Fixed problem with test where the CHILD_ADDED event would fire for a non related zNode, causing the addedLatch to complete prematurely. This meant that the final asserti

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/master bec1781e8 -> d55585fd4


 #noissue - Fixed problem with test where the CHILD_ADDED event would fire for 
a non related zNode, causing the addedLatch to complete prematurely. This meant 
that the final assertion in the test would fail.


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

Branch: refs/heads/master
Commit: d55585fd4652ba01ec0768e37a7996585a2c55fc
Parents: bec1781
Author: Cam McKenzie 
Authored: Wed Jun 15 11:09:31 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 11:09:31 2016 +1000

--
 .../recipes/cache/TestPathChildrenCache.java| 21 +++-
 1 file changed, 20 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/d55585fd/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
index 887df54..bf998ea 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
@@ -23,6 +23,8 @@ import com.google.common.collect.Lists;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.framework.api.UnhandledErrorListener;
+import org.apache.curator.framework.state.ConnectionState;
+import org.apache.curator.framework.state.ConnectionStateListener;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 import org.apache.curator.retry.RetryOneTime;
 import org.apache.curator.test.BaseClassForTests;
@@ -79,7 +81,8 @@ public class TestPathChildrenCache extends BaseClassForTests
 @Override
 public void childEvent(CuratorFramework client, 
PathChildrenCacheEvent event) throws Exception
 {
-if ( event.getType() == 
PathChildrenCacheEvent.Type.CHILD_ADDED )
+if ( event.getType() == 
PathChildrenCacheEvent.Type.CHILD_ADDED  &&
+ event.getData().getPath().equals("/baz"))
 {
 addedLatch.countDown();
 }
@@ -88,8 +91,24 @@ public class TestPathChildrenCache extends BaseClassForTests
 cache.getListenable().addListener(listener);
 cache.start();
 Assert.assertTrue(timing.awaitLatch(ensurePathLatch));
+
+final CountDownLatch connectedLatch = new CountDownLatch(1);
+client.getConnectionStateListenable().addListener(new 
ConnectionStateListener()
+{
+
+@Override
+public void stateChanged(CuratorFramework client, 
ConnectionState newState)
+{
+if(newState == ConnectionState.CONNECTED)
+{
+connectedLatch.countDown();
+}
+}
+});
 
 server = new TestingServer(serverPort, true);
+
+Assert.assertTrue(timing.awaitLatch(connectedLatch));
 
 client.create().creatingParentContainersIfNeeded().forPath("/baz", 
new byte[]{1, 2, 3});
 



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

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

Branch: refs/heads/master
Commit: bec1781e8964c7e66a877d1c8abc361f96104e24
Parents: 269c998
Author: Cam McKenzie 
Authored: Wed Jun 15 09:53:46 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:53:46 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/bec1781e/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/bec1781e/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/bec1781e/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/bec1781e/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/bec1781e/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/bec1781e/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/bec1781e/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


[curator] Git Push Summary

2016-06-14 Thread cammckenzie
Repository: curator
Updated Tags:  refs/tags/apache-curator-2.11.0 [created] c715cd02a


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

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/master 3df4c493e -> bec1781e8


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

Branch: refs/heads/master
Commit: 269c9988377805b27db0c8d67218b330de367967
Parents: 3df4c49
Author: Cam McKenzie 
Authored: Wed Jun 15 09:53:36 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:53:36 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/269c9988/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/269c9988/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/269c9988/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/269c9988/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/269c9988/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/269c9988/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/269c9988/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] Git Push Summary

2016-06-14 Thread cammckenzie
Repository: curator
Updated Tags:  refs/tags/apache-curator-2.11.0 [deleted] a615c739f


[curator] Git Push Summary

2016-06-14 Thread cammckenzie
Repository: curator
Updated Tags:  refs/tags/apache-curator-2.11.0 [created] a615c739f


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

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/master 882437cb8 -> 3df4c493e


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

Branch: refs/heads/master
Commit: 337424801b9b20ed3d2f655629ccdb242a19bce5
Parents: 882437c
Author: Cam McKenzie 
Authored: Wed Jun 15 09:34:13 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:34:13 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/33742480/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/33742480/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/33742480/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/33742480/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/33742480/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/33742480/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/33742480/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
 
 

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

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

Branch: refs/heads/master
Commit: c5e6e2c261734451eeadb440fb4272fad4cb1007
Parents: ce48143
Author: Cam McKenzie 
Authored: Wed Jun 15 09:20:58 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:20:58 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/c5e6e2c2/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/c5e6e2c2/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/c5e6e2c2/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/c5e6e2c2/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/c5e6e2c2/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/c5e6e2c2/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/c5e6e2c2/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


[1/4] curator git commit: Back to 2.10.0-SNAPSHOT

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/master 64767734a -> 882437cb8


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

Branch: refs/heads/master
Commit: 2bac78c3e5767cb7b5935f60e8b19086a39e1cfc
Parents: 6476773
Author: Cam McKenzie 
Authored: Wed Jun 15 09:07:50 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 09:07: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| 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/2bac78c3/curator-client/pom.xml
--
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 526ab4c..2c02fcb 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/2bac78c3/curator-examples/pom.xml
--
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 73b1dd2..78892c2 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/2bac78c3/curator-framework/pom.xml
--
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 4565017..dd05e29 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/2bac78c3/curator-recipes/pom.xml
--
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index ac3b015..dfab08f 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/2bac78c3/curator-test/pom.xml
--
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 44d695c..456a314 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/2bac78c3/curator-x-discovery-server/pom.xml
--
diff --git a/curator-x-discovery-server/pom.xml 
b/curator-x-discovery-server/pom.xml
index bd07288..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.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/2bac78c3/curator-x-discovery/pom.xml
--
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 7e6c3c1..05d0eb7 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-14 Thread cammckenzie
Repository: curator
Updated Tags:  refs/tags/apache-curator-3.2.0 [deleted] 7dd8539bc


[1/2] curator git commit: [CURATOR-331] Make unhandledErrorListenable in TreeCache

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/master 1cc120251 -> 64767734a


[CURATOR-331] Make unhandledErrorListenable in TreeCache


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

Branch: refs/heads/master
Commit: 7ae8c2da7eb401e376030643770d408fdeaa8239
Parents: 5584a61
Author: Julie Kim 
Authored: Sat Jun 4 17:30:19 2016 +0900
Committer: Julie Kim 
Committed: Sat Jun 4 17:30:19 2016 +0900

--
 .../framework/recipes/cache/TreeCache.java  |  2 +-
 .../framework/recipes/cache/TestTreeCache.java  | 50 ++--
 2 files changed, 48 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/7ae8c2da/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--
diff --git 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
index 914d336..95b8b99 100644
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
@@ -633,7 +633,7 @@ public class TreeCache implements Closeable
  * TODO: consider making public.
  */
 @VisibleForTesting
-Listenable getUnhandledErrorListenable()
+public Listenable getUnhandledErrorListenable()
 {
 return errorListeners;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/7ae8c2da/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index 2cf9e70..2d0ae83 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,12 +21,15 @@ package org.apache.curator.framework.recipes.cache;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.api.UnhandledErrorListener;
+import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
 import org.apache.curator.test.KillSession;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.zookeeper.CreateMode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class TestTreeCache extends BaseTestTreeCache
 {
@@ -567,4 +570,45 @@ public class TestTreeCache extends BaseTestTreeCache
 assertEvent(TreeCacheEvent.Type.NODE_ADDED, "/test");
 assertNoMoreEvents();
 }
+
+@Test
+public void testErrorListener() throws Exception
+{
+client.create().forPath("/test");
+
+cache = buildWithListeners(TreeCache.newBuilder(client, "/test"));
+
+// Register a listener that throws an exception for the event
+cache.getListenable().addListener(new TreeCacheListener()
+{
+@Override
+public void childEvent(CuratorFramework client, TreeCacheEvent 
event) throws Exception
+{
+if (event.getType() == Type.NODE_UPDATED) {
+throw new RuntimeException("Test Exception");
+}
+}
+});
+
+cache.getUnhandledErrorListenable().removeListener(errorListener);
+final AtomicBoolean isProcessed = new AtomicBoolean(false);
+cache.getUnhandledErrorListenable().addListener(new 
UnhandledErrorListener()
+{
+@Override
+public void unhandledError(String message, Throwable e)
+{
+Assert.assertFalse(isProcessed.compareAndSet(false, true));
+

[1/2] curator git commit: [CURATOR-331] Make unhandledErrorListenable in TreeCache

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/CURATOR-331 [created] 64767734a


[CURATOR-331] Make unhandledErrorListenable in TreeCache


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

Branch: refs/heads/CURATOR-331
Commit: 7ae8c2da7eb401e376030643770d408fdeaa8239
Parents: 5584a61
Author: Julie Kim 
Authored: Sat Jun 4 17:30:19 2016 +0900
Committer: Julie Kim 
Committed: Sat Jun 4 17:30:19 2016 +0900

--
 .../framework/recipes/cache/TreeCache.java  |  2 +-
 .../framework/recipes/cache/TestTreeCache.java  | 50 ++--
 2 files changed, 48 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/7ae8c2da/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--
diff --git 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
index 914d336..95b8b99 100644
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
@@ -633,7 +633,7 @@ public class TreeCache implements Closeable
  * TODO: consider making public.
  */
 @VisibleForTesting
-Listenable getUnhandledErrorListenable()
+public Listenable getUnhandledErrorListenable()
 {
 return errorListeners;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/7ae8c2da/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index 2cf9e70..2d0ae83 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,12 +21,15 @@ package org.apache.curator.framework.recipes.cache;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.api.UnhandledErrorListener;
+import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
 import org.apache.curator.test.KillSession;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.zookeeper.CreateMode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class TestTreeCache extends BaseTestTreeCache
 {
@@ -567,4 +570,45 @@ public class TestTreeCache extends BaseTestTreeCache
 assertEvent(TreeCacheEvent.Type.NODE_ADDED, "/test");
 assertNoMoreEvents();
 }
+
+@Test
+public void testErrorListener() throws Exception
+{
+client.create().forPath("/test");
+
+cache = buildWithListeners(TreeCache.newBuilder(client, "/test"));
+
+// Register a listener that throws an exception for the event
+cache.getListenable().addListener(new TreeCacheListener()
+{
+@Override
+public void childEvent(CuratorFramework client, TreeCacheEvent 
event) throws Exception
+{
+if (event.getType() == Type.NODE_UPDATED) {
+throw new RuntimeException("Test Exception");
+}
+}
+});
+
+cache.getUnhandledErrorListenable().removeListener(errorListener);
+final AtomicBoolean isProcessed = new AtomicBoolean(false);
+cache.getUnhandledErrorListenable().addListener(new 
UnhandledErrorListener()
+{
+@Override
+public void unhandledError(String message, Throwable e)
+{
+Assert.assertFalse(isProcessed.compareAndSet(false, true));
+  

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

2016-06-14 Thread cammckenzie
Merge branch 'CURATOR-331' of https://github.com/julnamoo/curator into 
CURATOR-331


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

Branch: refs/heads/CURATOR-331
Commit: 64767734acfa7908f27cb77a61db87ce1dea9372
Parents: 1cc1202 7ae8c2d
Author: Cam McKenzie 
Authored: Wed Jun 15 08:34:49 2016 +1000
Committer: Cam McKenzie 
Committed: Wed Jun 15 08:34:49 2016 +1000

--
 .../framework/recipes/cache/TreeCache.java  |  2 +-
 .../framework/recipes/cache/TestTreeCache.java  | 50 ++--
 2 files changed, 48 insertions(+), 4 deletions(-)
--




[curator] Git Push Summary

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/CURATOR-331 [deleted] dd8170507


[1/2] curator git commit: [CURATOR-331] Make unhandledErrorListenable in TreeCache

2016-06-14 Thread cammckenzie
Repository: curator
Updated Branches:
  refs/heads/CURATOR-331 [created] dd8170507


[CURATOR-331] Make unhandledErrorListenable in TreeCache


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

Branch: refs/heads/CURATOR-331
Commit: 7ae8c2da7eb401e376030643770d408fdeaa8239
Parents: 5584a61
Author: Julie Kim 
Authored: Sat Jun 4 17:30:19 2016 +0900
Committer: Julie Kim 
Committed: Sat Jun 4 17:30:19 2016 +0900

--
 .../framework/recipes/cache/TreeCache.java  |  2 +-
 .../framework/recipes/cache/TestTreeCache.java  | 50 ++--
 2 files changed, 48 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/7ae8c2da/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
--
diff --git 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
index 914d336..95b8b99 100644
--- 
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
+++ 
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
@@ -633,7 +633,7 @@ public class TreeCache implements Closeable
  * TODO: consider making public.
  */
 @VisibleForTesting
-Listenable getUnhandledErrorListenable()
+public Listenable getUnhandledErrorListenable()
 {
 return errorListeners;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/7ae8c2da/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index 2cf9e70..2d0ae83 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,12 +21,15 @@ package org.apache.curator.framework.recipes.cache;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.api.UnhandledErrorListener;
+import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
 import org.apache.curator.test.KillSession;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.zookeeper.CreateMode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class TestTreeCache extends BaseTestTreeCache
 {
@@ -567,4 +570,45 @@ public class TestTreeCache extends BaseTestTreeCache
 assertEvent(TreeCacheEvent.Type.NODE_ADDED, "/test");
 assertNoMoreEvents();
 }
+
+@Test
+public void testErrorListener() throws Exception
+{
+client.create().forPath("/test");
+
+cache = buildWithListeners(TreeCache.newBuilder(client, "/test"));
+
+// Register a listener that throws an exception for the event
+cache.getListenable().addListener(new TreeCacheListener()
+{
+@Override
+public void childEvent(CuratorFramework client, TreeCacheEvent 
event) throws Exception
+{
+if (event.getType() == Type.NODE_UPDATED) {
+throw new RuntimeException("Test Exception");
+}
+}
+});
+
+cache.getUnhandledErrorListenable().removeListener(errorListener);
+final AtomicBoolean isProcessed = new AtomicBoolean(false);
+cache.getUnhandledErrorListenable().addListener(new 
UnhandledErrorListener()
+{
+@Override
+public void unhandledError(String message, Throwable e)
+{
+Assert.assertFalse(isProcessed.compareAndSet(false, true));
+  

[6/7] curator git commit: # noissue - Updated LOST handling so that the poll will only take 1/2 the session timeout if the SUSPENDED state has not yet been reached. Reduced waiting time on semaphore t

2016-06-14 Thread cammckenzie
 # noissue - Updated LOST handling so that the poll will only take 1/2 the 
session timeout if the SUSPENDED state has not yet been reached. Reduced 
waiting time on semaphore test.


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

Branch: refs/heads/CURATOR-3.0
Commit: 0559df588ca724540ba2f6e3f1889190586dd18e
Parents: ef36275
Author: Cam McKenzie 
Authored: Tue Jun 14 14:12:15 2016 +1000
Committer: Cam McKenzie 
Committed: Tue Jun 14 14:12:15 2016 +1000

--
 .../org/apache/curator/framework/state/ConnectionStateManager.java | 2 +-
 .../curator/framework/recipes/locks/TestInterProcessSemaphore.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/0559df58/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
index c420a12..56c2250 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
@@ -252,7 +252,7 @@ public class ConnectionStateManager implements Closeable
 {
 int lastNegotiatedSessionTimeoutMs = 
client.getZookeeperClient().getLastNegotiatedSessionTimeoutMs();
 int useSessionTimeoutMs = (lastNegotiatedSessionTimeoutMs > 0) 
? lastNegotiatedSessionTimeoutMs : sessionTimeoutMs;
-long elapsedMs = startOfSuspendedEpoch == 0 ? 0 : 
System.currentTimeMillis() - startOfSuspendedEpoch;
+long elapsedMs = startOfSuspendedEpoch == 0 ? 
useSessionTimeoutMs / 2 : System.currentTimeMillis() - startOfSuspendedEpoch;
 long pollMaxMs = useSessionTimeoutMs - elapsedMs;
 
 final ConnectionState newState = eventQueue.poll(pollMaxMs, 
TimeUnit.MILLISECONDS);

http://git-wip-us.apache.org/repos/asf/curator/blob/0559df58/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 079b12c..488b776 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
@@ -150,7 +150,7 @@ public class TestInterProcessSemaphore extends 
BaseClassForTests
 });
   
 server.stop();
-Assert.assertTrue(timing.multiple(2).awaitLatch(lostLatch));
+Assert.assertTrue(timing.multiple(1.25).awaitLatch(lostLatch));
 InterProcessSemaphoreV2.debugAcquireLatch.countDown();  // the 
waiting semaphore proceeds to getChildren - which should fail
 
Assert.assertTrue(timing.awaitLatch(InterProcessSemaphoreV2.debugFailedGetChildrenLatch));
  // wait until getChildren fails
 



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

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

Branch: refs/heads/CURATOR-3.0
Commit: bc1960f13dc3cdc3ad2062385077637e139fc3e7
Parents: 93b1408
Author: Cam McKenzie 
Authored: Mon Jun 6 12:38:02 2016 +1000
Committer: Cam McKenzie 
Committed: Mon Jun 6 12:38:02 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/bc1960f1/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/bc1960f1/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/bc1960f1/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/bc1960f1/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/bc1960f1/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/bc1960f1/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/bc1960f1/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 commit: Should never send ZooDefs.Ids.CREATOR_ALL_ACL to the validator

2016-06-14 Thread randgalt
Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 2ec35018e -> f830e5884


Should never send ZooDefs.Ids.CREATOR_ALL_ACL to the validator


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

Branch: refs/heads/CURATOR-3.0
Commit: f830e588460e8a90831de6890c112554d29cddab
Parents: 2ec3501
Author: randgalt 
Authored: Tue Jun 14 15:43:20 2016 -0500
Committer: randgalt 
Committed: Tue Jun 14 15:43:20 2016 -0500

--
 .../apache/curator/framework/imps/CuratorMultiTransactionImpl.java | 2 +-
 .../java/org/apache/curator/framework/imps/SetDataBuilderImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/f830e588/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
index 40d0d2d..4b4d473 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
@@ -138,7 +138,7 @@ public class CuratorMultiTransactionImpl implements
 else if ( curatorOp.get().getType() == ZooDefs.OpCode.setData )
 {
 SetDataRequest setDataRequest = 
(SetDataRequest)curatorOp.get().toRequestRecord();
-schema.validateGeneral(setDataRequest.getPath(), 
setDataRequest.getData(), ZooDefs.Ids.CREATOR_ALL_ACL);
+schema.validateGeneral(setDataRequest.getPath(), 
setDataRequest.getData(), null);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/curator/blob/f830e588/curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java
index 4ca11b8..e84a3bd 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java
@@ -242,7 +242,7 @@ class SetDataBuilderImpl implements SetDataBuilder, 
BackgroundOperation

curator git commit: Should not take a type parameter

2016-06-14 Thread randgalt
Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 d27a70c28 -> 2ec35018e


Should not take a type parameter


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

Branch: refs/heads/CURATOR-3.0
Commit: 2ec35018e013a52caa7ffbce411c393014fed032
Parents: d27a70c
Author: randgalt 
Authored: Tue Jun 14 11:42:52 2016 -0500
Committer: randgalt 
Committed: Tue Jun 14 11:42:52 2016 -0500

--
 .../curator/framework/api/ErrorListenerMultiTransactionMain.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/2ec35018/curator-framework/src/main/java/org/apache/curator/framework/api/ErrorListenerMultiTransactionMain.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/api/ErrorListenerMultiTransactionMain.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/api/ErrorListenerMultiTransactionMain.java
index 83450cf..2237cd2 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/api/ErrorListenerMultiTransactionMain.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/api/ErrorListenerMultiTransactionMain.java
@@ -20,7 +20,7 @@ package org.apache.curator.framework.api;
 
 import 
org.apache.curator.framework.api.transaction.CuratorMultiTransactionMain;
 
-public interface ErrorListenerMultiTransactionMain extends 
CuratorMultiTransactionMain
+public interface ErrorListenerMultiTransactionMain extends 
CuratorMultiTransactionMain
 {
 /**
  * Set an error listener for this background operation. If an exception