Merge branch 'master' into CURATOR-72
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/777a5f13 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/777a5f13 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/777a5f13 Branch: refs/heads/master Commit: 777a5f13ca1055849d4ffa9c3811c0e3283b2168 Parents: 5238d5f 863eaee Author: randgalt <randg...@apache.org> Authored: Mon Feb 3 13:57:36 2014 -0500 Committer: randgalt <randg...@apache.org> Committed: Mon Feb 3 13:57:36 2014 -0500 ---------------------------------------------------------------------- .../org/apache/curator/ConnectionState.java | 4 +- .../exhibitor/DefaultExhibitorRestClient.java | 4 +- .../apache/curator/utils/CloseableUtils.java | 70 ++++++++++++++++++++ .../curator/TestSessionFailRetryLoop.java | 10 +-- .../TestExhibitorEnsembleProvider.java | 6 +- .../src/main/java/cache/PathCacheExample.java | 10 +-- .../main/java/discovery/DiscoveryExample.java | 16 ++--- .../src/main/java/discovery/ExampleServer.java | 4 +- .../main/java/leader/LeaderSelectorExample.java | 8 +-- .../src/main/java/locking/LockingExample.java | 6 +- .../imps/CuratorTempFrameworkImpl.java | 4 +- .../curator/framework/imps/TestCompression.java | 8 +-- .../framework/imps/TestFailedDeleteManager.java | 10 +-- .../curator/framework/imps/TestFramework.java | 6 +- .../framework/imps/TestFrameworkBackground.java | 8 +-- .../framework/imps/TestFrameworkEdges.java | 22 +++--- .../curator/framework/imps/TestMultiClient.java | 6 +- .../framework/imps/TestNamespaceFacade.java | 12 ++-- .../framework/imps/TestNeverConnected.java | 4 +- .../curator/framework/imps/TestReadOnly.java | 6 +- .../framework/imps/TestTempFramework.java | 6 +- .../framework/imps/TestWatcherIdentity.java | 10 +-- .../curator/framework/imps/TestWithCluster.java | 10 +-- .../framework/recipes/leader/LeaderLatch.java | 2 +- .../framework/recipes/locks/ChildReaper.java | 4 +- .../recipes/locks/InterProcessSemaphore.java | 6 +- .../recipes/locks/InterProcessSemaphoreV2.java | 6 +- .../recipes/queue/DistributedQueue.java | 4 +- .../framework/recipes/queue/QueueSharder.java | 4 +- .../barriers/TestDistributedBarrier.java | 10 +-- .../barriers/TestDistributedDoubleBarrier.java | 8 +-- .../framework/recipes/cache/TestNodeCache.java | 18 ++--- .../recipes/cache/TestPathChildrenCache.java | 24 +++---- .../cache/TestPathChildrenCacheInCluster.java | 8 +-- .../recipes/leader/TestLeaderLatch.java | 28 ++++---- .../recipes/leader/TestLeaderLatchCluster.java | 8 +-- .../recipes/leader/TestLeaderSelector.java | 22 +++--- .../leader/TestLeaderSelectorCluster.java | 10 +-- .../leader/TestLeaderSelectorParticipants.java | 10 +-- .../leader/TestLeaderSelectorWithExecutor.java | 6 +- .../recipes/locks/SemaphoreClient.java | 4 +- .../recipes/locks/TestChildReaper.java | 14 ++-- .../locks/TestInterProcessMutexBase.java | 8 +-- .../locks/TestInterProcessReadWriteLock.java | 12 ++-- .../locks/TestInterProcessSemaphore.java | 10 +-- .../locks/TestInterProcessSemaphoreCluster.java | 14 ++-- .../framework/recipes/locks/TestLockACLs.java | 6 +- .../locks/TestLockCleanlinessWithFaults.java | 4 +- .../framework/recipes/locks/TestReaper.java | 38 +++++------ .../nodes/TestPersistentEphemeralNode.java | 8 +-- .../queue/TestBoundedDistributedQueue.java | 12 ++-- .../queue/TestDistributedDelayQueue.java | 14 ++-- .../recipes/queue/TestDistributedIdQueue.java | 10 +-- .../queue/TestDistributedPriorityQueue.java | 18 ++--- .../recipes/queue/TestDistributedQueue.java | 50 +++++++------- .../recipes/queue/TestQueueSharder.java | 16 ++--- .../queue/TestSimpleDistributedQueue.java | 4 +- .../recipes/shared/TestSharedCount.java | 4 +- .../discovery/server/rest/InstanceCleanup.java | 2 +- .../src/site/confluence/index.confluence | 8 +-- .../x/discovery/details/ServiceCacheImpl.java | 4 +- .../discovery/details/ServiceDiscoveryImpl.java | 6 +- .../curator/x/discovery/TestServiceCache.java | 10 +-- .../x/discovery/TestServiceDiscovery.java | 12 ++-- 64 files changed, 393 insertions(+), 323 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/777a5f13/curator-client/src/main/java/org/apache/curator/ConnectionState.java ----------------------------------------------------------------------
