This is an automated email from the ASF dual-hosted git repository.

randgalt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/curator.git

commit 973cb0ba6825efca27095e56948af6a3c8455abe
Merge: 7f65c9e 6cf28ec
Author: randgalt <[email protected]>
AuthorDate: Mon Feb 11 07:47:18 2019 -0500

    Merge branch 'CURATOR-498'

 .../org/apache/curator/utils/Compatibility.java    |  45 ++++++--
 .../curator/utils/InjectSessionExpiration.java     |  34 +-----
 .../test/java/org/apache/curator/BasicTests.java   |   4 +-
 .../apache/curator/TestSessionFailRetryLoop.java   |  10 +-
 .../curator/framework/imps/CreateBuilderImpl.java  |  80 +++++++-------
 .../curator/framework/imps/ProtectedMode.java      | 113 ++++++++++++++++++++
 .../imps/TestEnabledSessionExpiredState.java       |   4 +-
 .../curator/framework/imps/TestFrameworkEdges.java | 118 ++++++++++++++++++---
 .../curator/framework/imps/TestWithCluster.java    |   4 +-
 .../state/TestConnectionStateManager.java          |  34 +++---
 .../framework/recipes/leader/LeaderLatch.java      |  32 +++++-
 .../framework/recipes/cache/BaseTestTreeCache.java |  13 ++-
 .../framework/recipes/cache/TestNodeCache.java     |   4 +-
 .../recipes/cache/TestPathChildrenCache.java       |  10 +-
 .../framework/recipes/cache/TestTreeCache.java     |  16 ++-
 .../framework/recipes/leader/TestLeaderLatch.java  |  36 +++++++
 .../recipes/leader/TestLeaderSelector.java         |   8 +-
 .../recipes/locks/TestInterProcessMutex.java       |   4 +-
 .../recipes/locks/TestInterProcessMutexBase.java   |   4 +-
 .../recipes/nodes/TestPersistentEphemeralNode.java |  52 ++++-----
 .../org/apache/curator/test/Compatibility.java     |   8 --
 .../org/apache/curator/test/Compatibility.java     |   7 --
 .../curator/test/compatibility/KillSession2.java   |  40 -------
 .../x/discovery/details/TestServiceDiscovery.java  |   8 +-
 24 files changed, 455 insertions(+), 233 deletions(-)

Reply via email to