Merge branch 'master' into CURATOR-79
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/f8aabb0b Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f8aabb0b Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/f8aabb0b Branch: refs/heads/master Commit: f8aabb0bce50f3f0fa7681e436ff1440237a70b3 Parents: c92ffee 053feb4 Author: randgalt <[email protected]> Authored: Wed Aug 20 16:25:43 2014 -0500 Committer: randgalt <[email protected]> Committed: Wed Aug 20 16:25:43 2014 -0500 ---------------------------------------------------------------------- .../org/apache/curator/utils/PathUtils.java | 7 +- .../curator/framework/imps/NamespaceFacade.java | 12 --- .../framework/imps/TestNamespaceFacade.java | 46 ++++++++ .../recipes/atomic/DistributedAtomicValue.java | 4 +- .../recipes/atomic/PromotedToLock.java | 3 +- .../recipes/barriers/DistributedBarrier.java | 3 +- .../barriers/DistributedDoubleBarrier.java | 3 +- .../framework/recipes/cache/ChildData.java | 3 +- .../recipes/cache/GetDataOperation.java | 4 +- .../framework/recipes/cache/NodeCache.java | 3 +- .../recipes/cache/PathChildrenCache.java | 7 +- .../framework/recipes/cache/TreeCache.java | 3 +- .../framework/recipes/leader/LeaderLatch.java | 5 +- .../recipes/leader/LeaderSelector.java | 3 +- .../framework/recipes/locks/ChildReaper.java | 3 +- .../recipes/locks/InterProcessMultiLock.java | 1 + .../recipes/locks/InterProcessMutex.java | 3 +- .../recipes/locks/InterProcessSemaphore.java | 1 + .../recipes/locks/InterProcessSemaphoreV2.java | 2 + .../framework/recipes/locks/LockInternals.java | 3 +- .../recipes/locks/PredicateResults.java | 4 +- .../recipes/nodes/PersistentEphemeralNode.java | 3 +- .../framework/recipes/queue/ChildrenCache.java | 3 +- .../recipes/queue/DistributedQueue.java | 6 +- .../framework/recipes/queue/QueueBuilder.java | 5 +- .../framework/recipes/queue/QueueSafety.java | 5 +- .../recipes/queue/SimpleDistributedQueue.java | 3 +- .../framework/recipes/shared/SharedValue.java | 3 +- .../recipes/cache/TestPathChildrenCache.java | 105 ++++++++++++++++++- .../recipes/leader/TestLeaderLatch.java | 8 ++ .../discovery/details/DownInstanceManager.java | 11 +- .../discovery/details/ServiceDiscoveryImpl.java | 26 ++++- pom.xml | 16 ++- 33 files changed, 267 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
