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 2017/07/31 14:36:38 UTC
[31/53] [abbrv] curator git commit: Merge branch 'master' into
CURATOR-426
Merge branch 'master' into CURATOR-426
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/31d7f9a2
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/31d7f9a2
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/31d7f9a2
Branch: refs/heads/persistent-watch
Commit: 31d7f9a2040975dee08cb685d61cceb7015f9e32
Parents: 0906eb5 afc206c
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 14:27:07 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 14:27:07 2017 -0500
----------------------------------------------------------------------
.../main/java/org/apache/curator/RetryLoop.java | 2 +-
.../org/apache/curator/utils/Compatibility.java | 76 +++++
.../curator/utils/InjectSessionExpiration.java | 107 +++++++
.../java/org/apache/curator/BasicTests.java | 4 +-
.../curator/TestSessionFailRetryLoop.java | 11 +-
.../curator/framework/CuratorFramework.java | 7 +
.../framework/CuratorFrameworkFactory.java | 24 +-
.../apache/curator/framework/SafeIsTtlMode.java | 44 +++
.../imps/CompatibleCreateCallback.java | 26 ++
.../framework/imps/CreateBuilderImpl.java | 136 ++++++---
.../curator/framework/imps/CreateZK35.java | 47 +++
.../framework/imps/CuratorFrameworkImpl.java | 24 +-
.../imps/CuratorMultiTransactionImpl.java | 18 +-
.../framework/imps/WatcherRemovalManager.java | 7 +-
.../framework/state/ConnectionStateManager.java | 6 +-
.../curator/framework/imps/TestCleanState.java | 7 +
.../framework/imps/TestCreateReturningStat.java | 13 +-
.../imps/TestEnabledSessionExpiredState.java | 8 +-
.../curator/framework/imps/TestFramework.java | 3 +-
.../framework/imps/TestFrameworkEdges.java | 13 +-
.../framework/imps/TestReconfiguration.java | 11 +-
.../framework/imps/TestRemoveWatches.java | 6 +-
.../curator/framework/imps/TestTtlNodes.java | 6 +-
.../imps/TestWatcherRemovalManager.java | 6 +-
curator-recipes/pom.xml | 16 +
.../framework/recipes/nodes/PersistentNode.java | 3 +-
.../recipes/cache/TestEventOrdering.java | 4 +-
.../framework/recipes/cache/TestNodeCache.java | 4 +-
.../recipes/cache/TestPathChildrenCache.java | 4 +-
.../framework/recipes/cache/TestTreeCache.java | 7 +-
.../recipes/leader/TestLeaderLatch.java | 3 +-
.../recipes/leader/TestLeaderSelector.java | 9 +-
.../recipes/locks/TestInterProcessMutex.java | 5 +-
.../locks/TestInterProcessMutexBase.java | 17 +-
.../nodes/TestPersistentEphemeralNode.java | 14 +-
.../recipes/nodes/TestPersistentNode.java | 3 +-
.../recipes/nodes/TestPersistentTtlNode.java | 6 +-
.../recipes/shared/TestSharedCount.java | 6 +-
curator-test-zk34/README.md | 11 +
curator-test-zk34/pom.xml | 191 ++++++++++++
.../org/apache/curator/test/Compatibility.java | 35 +++
.../apache/curator/test/TestCompatibility.java | 97 ++++++
.../src/test/resources/log4j.properties | 27 ++
.../org/apache/curator/test/Compatibility.java | 34 +++
.../apache/curator/test/KillServerSession.java | 122 --------
.../org/apache/curator/test/KillSession.java | 67 -----
.../java/org/apache/curator/test/Timing.java | 75 +----
.../test/compatibility/CuratorTestBase.java | 28 ++
.../test/compatibility/KillSession2.java | 40 +++
.../curator/test/compatibility/Timing2.java | 299 +++++++++++++++++++
.../compatibility/Zk35MethodInterceptor.java | 56 ++++
.../x/async/CompletableBaseClassForTests.java | 4 +-
.../discovery/details/TestServiceDiscovery.java | 8 +-
pom.xml | 8 +
src/site/resources/images/arrow.png | Bin 0 -> 2159 bytes
src/site/site.xml | 5 +-
56 files changed, 1427 insertions(+), 393 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/31d7f9a2/curator-recipes/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/31d7f9a2/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/31d7f9a2/src/site/site.xml
----------------------------------------------------------------------