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 2014/06/18 16:30:06 UTC
[3/7] git commit: Merge branch 'CURATOR-114' of
github.com:cammckenzie/curator into CURATOR-114
Merge branch 'CURATOR-114' of github.com:cammckenzie/curator into CURATOR-114
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2337b64f
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2337b64f
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2337b64f
Branch: refs/heads/CURATOR-114
Commit: 2337b64fc5a1cfbbcbe462560cb0a8d2fef22c0a
Parents: 5d7d0c7 61eb388
Author: randgalt <ra...@apache.org>
Authored: Tue Jun 17 23:01:35 2014 -0500
Committer: randgalt <ra...@apache.org>
Committed: Tue Jun 17 23:01:35 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/curator/BasicTests.java | 2 +-
.../java/org/apache/curator/TestRetryLoop.java | 2 +-
.../framework/imps/TestFailedDeleteManager.java | 12 +-
.../curator/framework/imps/TestFramework.java | 2 +-
.../framework/imps/TestFrameworkEdges.java | 2 +-
.../recipes/leader/TestLeaderLatch.java | 2 +-
.../recipes/leader/TestLeaderSelector.java | 2 +-
.../locks/TestInterProcessMutexBase.java | 2 +-
.../org/apache/curator/test/TestingServer.java | 114 ++++++++++++++++---
.../curator/test/TestingZooKeeperServer.java | 98 +++++++++-------
.../x/discovery/TestServiceDiscovery.java | 5 +-
11 files changed, 171 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/2337b64f/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderLatch.java
----------------------------------------------------------------------