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 2013/06/10 17:00:48 UTC
[03/50] [abbrv] git commit: Merge branch 'master' into zk3.3.x
Merge branch 'master' into zk3.3.x
Conflicts:
CHANGES.txt
build.gradle
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/867b2eb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/867b2eb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/867b2eb0
Branch: refs/heads/zk3.3.x
Commit: 867b2eb0bd1bc8f9425b7eb567bba435142fa07c
Parents: 1504899 351f012
Author: Jordan Zimmerman <jo...@jordanzimmerman.com>
Authored: Tue Jul 24 10:46:36 2012 -0700
Committer: Jordan Zimmerman <jo...@jordanzimmerman.com>
Committed: Tue Jul 24 10:46:36 2012 -0700
----------------------------------------------------------------------
CHANGES.txt | 22 ++++++
.../framework/recipes/atomic/AtomicStats.java | 3 +
.../framework/recipes/atomic/AtomicValue.java | 3 +
.../recipes/atomic/CachedAtomicInteger.java | 3 +
.../recipes/atomic/CachedAtomicLong.java | 3 +
.../atomic/DistributedAtomicInteger.java | 8 ++
.../recipes/atomic/DistributedAtomicLong.java | 8 ++
.../recipes/atomic/DistributedAtomicValue.java | 8 ++
.../recipes/atomic/PromotedToLock.java | 3 +
.../recipes/barriers/DistributedBarrier.java | 10 +++
.../barriers/DistributedDoubleBarrier.java | 12 +++
.../recipes/cache/PathChildrenCache.java | 9 +++
.../recipes/cache/PathChildrenCacheEvent.java | 3 +
.../cache/PathChildrenCacheListener.java | 3 +
.../recipes/cache/PathChildrenCacheMode.java | 6 ++
.../framework/recipes/leader/LeaderLatch.java | 8 ++
.../recipes/leader/LeaderSelector.java | 6 ++
.../recipes/leader/LeaderSelectorListener.java | 5 ++
.../framework/recipes/leader/Participant.java | 3 +
.../recipes/locks/InterProcessMultiLock.java | 5 ++
.../recipes/locks/InterProcessMutex.java | 5 ++
.../locks/InterProcessReadWriteLock.java | 26 +++++++
.../recipes/locks/InterProcessSemaphore.java | 29 +++++++
.../locks/InterProcessSemaphoreMutex.java | 79 +++++++++++++++++++
.../curator/framework/recipes/locks/Lease.java | 5 ++
.../framework/recipes/locks/LockInternals.java | 34 +++++---
.../framework/recipes/locks/Revocable.java | 3 +
.../recipes/queue/BlockingQueueConsumer.java | 3 +
.../recipes/queue/DistributedDelayQueue.java | 7 ++
.../recipes/queue/DistributedIdQueue.java | 4 +
.../recipes/queue/DistributedPriorityQueue.java | 7 ++
.../recipes/queue/DistributedQueue.java | 14 ++++
.../framework/recipes/queue/ErrorMode.java | 4 +
.../framework/recipes/queue/MultiItem.java | 5 ++
.../framework/recipes/queue/QueueBuilder.java | 3 +
.../framework/recipes/queue/QueueConsumer.java | 3 +
.../recipes/queue/QueuePutListener.java | 4 +
.../framework/recipes/queue/QueueSafety.java | 4 +
.../recipes/queue/QueueSerializer.java | 3 +
.../framework/recipes/queue/QueueSharder.java | 19 +++++
.../recipes/queue/QueueSharderPolicies.java | 4 +
.../recipes/queue/SimpleDistributedQueue.java | 11 +++
.../framework/recipes/shared/SharedCount.java | 4 +
.../recipes/shared/SharedCountListener.java | 3 +
.../recipes/shared/SharedCountReader.java | 3 +
.../framework/recipes/shared/SharedValue.java | 4 +
.../recipes/shared/SharedValueListener.java | 3 +
.../recipes/shared/SharedValueReader.java | 3 +
.../recipes/locks/TestChildReaper.java | 40 ++++++++++
.../locks/TestInterProcessSemaphoreMutex.java | 42 ++++++++++
.../netflix/curator/test/ByteCodeRewrite.java | 81 ++++++++++++++++++++
.../netflix/curator/test/TestingCluster.java | 24 +-----
.../com/netflix/curator/test/TestingServer.java | 5 ++
53 files changed, 585 insertions(+), 34 deletions(-)
----------------------------------------------------------------------