Merge branch 'CURATOR-3.0' into CURATOR-248
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/940e845d Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/940e845d Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/940e845d Branch: refs/heads/CURATOR-248 Commit: 940e845d7e1d73b1e4804b6f37ee1ecddce7b67f Parents: 49b267d f8814f6 Author: randgalt <randg...@apache.org> Authored: Sun Sep 6 23:49:43 2015 -0700 Committer: randgalt <randg...@apache.org> Committed: Sun Sep 6 23:49:43 2015 -0700 ---------------------------------------------------------------------- .../curator/TestSessionFailRetryLoop.java | 9 +- .../curator/framework/recipes/locks/Locker.java | 83 +++++++++++++++++++ .../recipes/nodes/PersistentEphemeralNode.java | 16 ++++ .../framework/recipes/cache/TestTreeCache.java | 1 - .../locks/TestInterProcessMutexBase.java | 22 +++++ .../nodes/TestPersistentEphemeralNode.java | 17 ++-- .../org/apache/curator/test/KillSession.java | 87 ++++---------------- 7 files changed, 151 insertions(+), 84 deletions(-) ----------------------------------------------------------------------
