Merge branch 'CURATOR-160' into CURATOR-3.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/760473d7 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/760473d7 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/760473d7 Branch: refs/heads/CURATOR-215 Commit: 760473d762a8923e8b4266f77095583707037454 Parents: 143044b dbdcf2f Author: Scott Blum <[email protected]> Authored: Wed Aug 12 17:27:31 2015 -0400 Committer: Scott Blum <[email protected]> Committed: Wed Aug 12 17:27:31 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/curator/RetryLoop.java | 3 +- .../curator/ensemble/EnsembleListener.java | 24 ++ .../dynamic/DynamicEnsembleProvider.java | 61 +++ .../curator/framework/CuratorFramework.java | 12 + .../framework/api/AsyncReconfigurable.java | 29 ++ .../api/BackgroundStatConfigEnsembleable.java | 24 ++ .../api/BackgroundStatEnsembleable.java | 24 ++ .../framework/api/BackgroundStatable.java | 24 ++ .../curator/framework/api/Configurable.java | 29 ++ .../curator/framework/api/CuratorEventType.java | 10 + .../curator/framework/api/DataCallbackable.java | 32 ++ .../curator/framework/api/Ensembleable.java | 24 ++ .../curator/framework/api/GetConfigBuilder.java | 27 ++ .../api/IncrementalReconfigBuilder.java | 33 ++ .../JoinBackgroundStatConfigEnsembleable.java | 30 ++ .../apache/curator/framework/api/Joinable.java | 31 ++ .../LeaveBackgroundStatConfigEnsembleable.java | 30 ++ .../apache/curator/framework/api/Leaveable.java | 30 ++ .../curator/framework/api/Memberable.java | 31 ++ .../api/NonIncrementalReconfigBuilder.java | 32 ++ .../curator/framework/api/ReconfigBuilder.java | 26 ++ .../framework/api/SyncReconfigurable.java | 30 ++ .../framework/imps/CuratorFrameworkImpl.java | 10 + .../imps/EnsembleServersAndConfig.java | 52 +++ .../curator/framework/imps/EnsembleTracker.java | 167 ++++++++ .../framework/imps/GetConfigBuilderImpl.java | 187 +++++++++ .../framework/imps/ReconfigBuilderImpl.java | 216 +++++++++++ .../framework/imps/TestReconfiguration.java | 388 +++++++++++++++++++ .../org/apache/curator/test/InstanceSpec.java | 4 + .../curator/test/QuorumConfigBuilder.java | 2 +- .../org/apache/curator/test/TestingCluster.java | 1 + 31 files changed, 1621 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
