Merge branch 'master' into CURATOR-96 Conflicts: pom.xml
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/449eeff5 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/449eeff5 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/449eeff5 Branch: refs/heads/master Commit: 449eeff54377a2dd0ab8f06d72b678aa877d97cc Parents: 43cfb8f 0f7acf7 Author: randgalt <randg...@apache.org> Authored: Mon Apr 21 17:44:07 2014 -0500 Committer: randgalt <randg...@apache.org> Committed: Mon Apr 21 17:44:07 2014 -0500 ---------------------------------------------------------------------- curator-client/pom.xml | 4 +- .../apache/curator/CuratorZookeeperClient.java | 2 + .../main/java/org/apache/curator/RetryLoop.java | 6 +- .../apache/curator/SessionFailRetryLoop.java | 11 +- .../apache/curator/utils/CloseableUtils.java | 4 +- .../org/apache/curator/utils/EnsurePath.java | 10 +- curator-examples/pom.xml | 2 +- curator-framework/pom.xml | 4 +- .../curator/framework/CuratorFramework.java | 2 +- .../curator/framework/api/CreateBuilder.java | 4 +- .../api/transaction/CuratorTransaction.java | 16 +-- .../transaction/CuratorTransactionResult.java | 4 +- curator-recipes/pom.xml | 4 +- .../framework/recipes/cache/ChildData.java | 4 +- .../recipes/cache/PathChildrenCache.java | 11 +- .../framework/recipes/leader/LeaderLatch.java | 38 ++++--- .../recipes/leader/LeaderSelector.java | 68 ++++++------- .../recipes/locks/InterProcessLock.java | 13 +-- .../recipes/locks/InterProcessMutex.java | 4 +- .../locks/InterProcessReadWriteLock.java | 6 +- .../recipes/locks/InterProcessSemaphoreV2.java | 8 -- .../recipes/nodes/PersistentEphemeralNode.java | 1 - .../framework/recipes/queue/ChildrenCache.java | 6 +- .../recipes/queue/DistributedDelayQueue.java | 4 +- .../recipes/queue/DistributedIdQueue.java | 2 +- .../recipes/queue/DistributedPriorityQueue.java | 4 +- .../recipes/queue/DistributedQueue.java | 16 ++- .../recipes/leader/TestLeaderSelector.java | 101 +++++++++++++++++++ curator-test/pom.xml | 4 +- curator-x-discovery-server/pom.xml | 4 +- .../server/rest/DiscoveryResource.java | 4 +- curator-x-discovery/pom.xml | 4 +- .../curator/x/discovery/ServiceDiscovery.java | 1 - .../discovery/details/ServiceDiscoveryImpl.java | 1 - pom.xml | 4 +- 35 files changed, 240 insertions(+), 141 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/449eeff5/curator-client/pom.xml ---------------------------------------------------------------------- diff --cc curator-client/pom.xml index 5fd7d67,88948b5..04cce79 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@@ -24,11 -24,12 +24,11 @@@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-client</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> <packaging>bundle</packaging> <name>Curator Client</name> http://git-wip-us.apache.org/repos/asf/curator/blob/449eeff5/curator-examples/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/449eeff5/curator-framework/pom.xml ---------------------------------------------------------------------- diff --cc curator-framework/pom.xml index 162e557,4703b1a..1b95c31 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@@ -24,11 -24,12 +24,11 @@@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> <packaging>bundle</packaging> <name>Curator Framework</name> http://git-wip-us.apache.org/repos/asf/curator/blob/449eeff5/curator-recipes/pom.xml ---------------------------------------------------------------------- diff --cc curator-recipes/pom.xml index 5fe9a31,9a7bcdf..77069a1 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@@ -24,11 -24,12 +24,11 @@@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> <packaging>bundle</packaging> <name>Curator Recipes</name> http://git-wip-us.apache.org/repos/asf/curator/blob/449eeff5/curator-test/pom.xml ---------------------------------------------------------------------- diff --cc curator-test/pom.xml index 83d3329,91828e4..86ffd46 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@@ -24,11 -24,12 +24,11 @@@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> <name>Curator Testing</name> <description>Unit testing utilities.</description> http://git-wip-us.apache.org/repos/asf/curator/blob/449eeff5/curator-x-discovery-server/pom.xml ---------------------------------------------------------------------- diff --cc curator-x-discovery-server/pom.xml index 6a3b96b,8523e49..418afeb --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@@ -24,11 -24,12 +24,11 @@@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-x-discovery-server</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> <packaging>bundle</packaging> <name>Curator Service Discovery Server</name> http://git-wip-us.apache.org/repos/asf/curator/blob/449eeff5/curator-x-discovery/pom.xml ---------------------------------------------------------------------- diff --cc curator-x-discovery/pom.xml index fc54b49,2ecd301..57bc598 --- a/curator-x-discovery/pom.xml +++ b/curator-x-discovery/pom.xml @@@ -24,11 -24,12 +24,11 @@@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-x-discovery</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3-SNAPSHOT</version> <packaging>bundle</packaging> <name>Curator Service Discovery</name> http://git-wip-us.apache.org/repos/asf/curator/blob/449eeff5/pom.xml ----------------------------------------------------------------------