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/19 00:04:53 UTC
[2/3] curator git commit: Merge branch 'master' into CURATOR-244
Merge branch 'master' into CURATOR-244
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b08b543d
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b08b543d
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b08b543d
Branch: refs/heads/CURATOR-3.0
Commit: b08b543da519cf932b4d47a2e5e5ad69c76f49cc
Parents: d6da90e 5d485b0
Author: randgalt <ra...@apache.org>
Authored: Mon Jan 18 18:04:07 2016 -0500
Committer: randgalt <ra...@apache.org>
Committed: Mon Jan 18 18:04:07 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 ++-
.../framework/api/VersionPathAndBytesable.java | 25 ++++++++
.../transaction/TransactionCreateBuilder.java | 5 +-
.../transaction/TransactionSetDataBuilder.java | 4 +-
.../curator/framework/imps/Backgrounding.java | 2 +
.../framework/imps/CreateBuilderImpl.java | 15 +++--
.../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/imps/SetDataBuilderImpl.java | 8 +--
.../framework/listen/ListenerContainer.java | 2 +
.../framework/state/ConnectionStateManager.java | 14 +++--
.../framework/imps/TestTransactions.java | 46 +++++++++++++-
.../recipes/AfterConnectionEstablished.java | 1 +
.../recipes/cache/DefaultTreeCacheSelector.java | 37 +++++++++++
.../framework/recipes/cache/NodeCache.java | 4 ++
.../recipes/cache/PathChildrenCache.java | 4 ++
.../framework/recipes/cache/TreeCache.java | 45 +++++++++----
.../recipes/cache/TreeCacheSelector.java | 66 ++++++++++++++++++++
.../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 +++++------
.../framework/recipes/cache/TestTreeCache.java | 57 +++++++++++++++--
.../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 ++++++++
54 files changed, 563 insertions(+), 106 deletions(-)
----------------------------------------------------------------------