curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [7/7] git commit: Merge branch 'master' into CURATOR-84
Date Tue, 26 Aug 2014 17:58:54 GMT
Merge branch 'master' into CURATOR-84

Conflicts:
	curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/PredicateResults.java
	curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutex.java


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/f9c69199
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f9c69199
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/f9c69199

Branch: refs/heads/master
Commit: f9c69199bf0ff81c49554e55133f319e1d880287
Parents: 942e23d 7d30d3d
Author: randgalt <randgalt@apache.org>
Authored: Tue Aug 26 12:58:26 2014 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Tue Aug 26 12:58:26 2014 -0500

----------------------------------------------------------------------
 .../org/apache/curator/utils/PathUtils.java     |  7 ++-
 .../framework/imps/CreateBuilderImpl.java       | 11 +++--
 .../framework/imps/CuratorFrameworkImpl.java    |  6 ++-
 .../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        |  3 +-
 .../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/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/leader/TestLeaderLatch.java         |  8 ++++
 pom.xml                                         |  4 +-
 31 files changed, 125 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/f9c69199/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/f9c69199/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/LockInternals.java
----------------------------------------------------------------------


Mime
View raw message