Merge branch 'CURATOR-160' of github.com:iocanel/curator into CURATOR-160
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/7ab1b370 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7ab1b370 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/7ab1b370 Branch: refs/heads/CURATOR-215 Commit: 7ab1b37030d33f839f1d208a01baf020da57c1a6 Parents: 2c576dc ad4889e Author: randgalt <[email protected]> Authored: Thu Nov 13 20:56:13 2014 -0500 Committer: randgalt <[email protected]> Committed: Thu Nov 13 20:56:13 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/curator/RetryLoop.java | 3 +- .../curator/ensemble/EnsembleListener.java | 24 + .../dynamic/DynamicEnsembleProvider.java | 61 +++ .../api/BackgroundStatConfigurable.java | 24 + .../framework/api/BackgroundStatable.java | 24 + .../curator/framework/api/Configurable.java | 29 ++ .../curator/framework/api/CuratorEventType.java | 10 + .../curator/framework/api/Ensembleable.java | 24 + .../curator/framework/api/GetConfigBuilder.java | 6 +- .../api/JoinBackgroundStatConfigurable.java | 30 ++ .../apache/curator/framework/api/Joinable.java | 15 +- .../api/LeaveBackgroundStatConfigurable.java | 30 ++ .../apache/curator/framework/api/Leaveable.java | 14 +- .../curator/framework/api/Memberable.java | 13 +- .../curator/framework/api/ReconfigBuilder.java | 6 +- .../imps/EnsembleServersAndConfig.java | 52 ++ .../curator/framework/imps/EnsembleTracker.java | 167 ++++++ .../framework/imps/GetConfigBuilderImpl.java | 165 ++++-- .../framework/imps/ReconfigBuilderImpl.java | 216 ++++---- .../framework/imps/TestReconfiguration.java | 505 +++++++++++-------- .../org/apache/curator/test/InstanceSpec.java | 4 + .../curator/test/QuorumConfigBuilder.java | 2 +- .../org/apache/curator/test/TestingCluster.java | 1 + 23 files changed, 1053 insertions(+), 372 deletions(-) ----------------------------------------------------------------------
