Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BCCE1177D9 for ; Tue, 12 May 2015 13:54:02 +0000 (UTC) Received: (qmail 57021 invoked by uid 500); 12 May 2015 13:54:02 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 56941 invoked by uid 500); 12 May 2015 13:54:02 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 56908 invoked by uid 99); 12 May 2015 13:54:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 13:54:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6D874E17E1; Tue, 12 May 2015 13:54:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randgalt@apache.org To: commits@curator.apache.org Date: Tue, 12 May 2015 13:54:07 -0000 Message-Id: In-Reply-To: <4f78bbf8221e442385ad54149899906d@git.apache.org> References: <4f78bbf8221e442385ad54149899906d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/25] curator git commit: Merge branch 'CURATOR-160' of github.com:iocanel/curator into CURATOR-160 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-3.0 Commit: 7ab1b37030d33f839f1d208a01baf020da57c1a6 Parents: 2c576dc ad4889e Author: randgalt Authored: Thu Nov 13 20:56:13 2014 -0500 Committer: randgalt 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(-) ----------------------------------------------------------------------