You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2016/01/18 22:04:10 UTC
[07/11] curator git commit: Merge branch 'master' into CURATOR-288
Merge branch 'master' into CURATOR-288
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/c1ea06b1
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/c1ea06b1
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/c1ea06b1
Branch: refs/heads/CURATOR-3.0
Commit: c1ea06b1bb5ada979b17e3d1e1f6a65897d1927e
Parents: bae4846 36a72d9
Author: randgalt <ra...@apache.org>
Authored: Sun Jan 17 21:34:27 2016 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jan 17 21:34:27 2016 -0500
----------------------------------------------------------------------
.../org/apache/curator/ConnectionState.java | 4 ++
.../apache/curator/CuratorZookeeperClient.java | 2 +
.../main/java/org/apache/curator/RetryLoop.java | 2 +
.../apache/curator/SessionFailRetryLoop.java | 2 +
.../exhibitor/ExhibitorEnsembleProvider.java | 2 +
.../org/apache/curator/utils/ThreadUtils.java | 23 ++++++++++
.../src/main/java/locking/LockingExample.java | 7 ++-
.../curator/framework/imps/Backgrounding.java | 2 +
.../framework/imps/CreateBuilderImpl.java | 3 ++
.../framework/imps/CuratorFrameworkImpl.java | 46 +++++++++++++-------
.../framework/imps/DeleteBuilderImpl.java | 2 +
.../framework/imps/FailedDeleteManager.java | 5 ++-
.../FindAndDeleteProtectedNodeInBackground.java | 3 ++
.../framework/imps/GetDataBuilderImpl.java | 2 +
.../curator/framework/imps/NamespaceImpl.java | 2 +
.../framework/imps/NamespaceWatcher.java | 2 +
.../framework/imps/OperationAndData.java | 11 ++++-
.../framework/listen/ListenerContainer.java | 2 +
.../framework/state/ConnectionStateManager.java | 14 +++---
.../recipes/AfterConnectionEstablished.java | 1 +
.../framework/recipes/cache/NodeCache.java | 4 ++
.../recipes/cache/PathChildrenCache.java | 4 ++
.../framework/recipes/cache/TreeCache.java | 7 +++
.../framework/recipes/leader/LeaderLatch.java | 5 +++
.../recipes/leader/LeaderSelector.java | 10 ++---
.../framework/recipes/locks/ChildReaper.java | 1 +
.../recipes/locks/InterProcessMultiLock.java | 4 ++
.../recipes/locks/InterProcessSemaphore.java | 4 ++
.../recipes/locks/InterProcessSemaphoreV2.java | 2 +
.../framework/recipes/locks/LockInternals.java | 2 +
.../curator/framework/recipes/locks/Reaper.java | 1 +
.../framework/recipes/nodes/GroupMember.java | 3 ++
.../recipes/nodes/PersistentEphemeralNode.java | 3 ++
.../recipes/queue/DistributedQueue.java | 43 ++++++++++--------
.../framework/recipes/queue/QueueSharder.java | 16 ++++---
.../framework/recipes/shared/SharedValue.java | 2 +
...estResetConnectionWithBackgroundFailure.java | 36 +++++++--------
.../curator/test/TestingZooKeeperMain.java | 31 ++++++++++++-
.../entity/JsonServiceInstanceMarshaller.java | 3 ++
.../entity/JsonServiceInstancesMarshaller.java | 2 +
.../server/rest/DiscoveryResource.java | 6 +++
.../discovery/server/rest/InstanceCleanup.java | 2 +
.../discovery/details/ServiceDiscoveryImpl.java | 3 ++
.../x/rpc/idl/discovery/DiscoveryService.java | 8 ++++
.../idl/discovery/DiscoveryServiceLowLevel.java | 7 +++
.../idl/services/CuratorProjectionService.java | 25 +++++++++++
46 files changed, 295 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/c1ea06b1/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
----------------------------------------------------------------------