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 630E811B3B for ; Mon, 11 Aug 2014 06:06:32 +0000 (UTC) Received: (qmail 5593 invoked by uid 500); 11 Aug 2014 06:06:32 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 5560 invoked by uid 500); 11 Aug 2014 06:06:32 -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 5510 invoked by uid 99); 11 Aug 2014 06:06:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Aug 2014 06:06:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E82189AA3F4; Mon, 11 Aug 2014 06:06:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cammckenzie@apache.org To: commits@curator.apache.org Date: Mon, 11 Aug 2014 06:06:32 -0000 Message-Id: <93559c742a174f219fb3c12709cd2f67@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'CURATOR-131' of https://github.com/madrob/curator into CURATOR-131 Merge branch 'CURATOR-131' of https://github.com/madrob/curator into CURATOR-131 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d2c37d0c Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d2c37d0c Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d2c37d0c Branch: refs/heads/CURATOR-131 Commit: d2c37d0ced2cc202c7d4c739e5647733cdf88954 Parents: 6bd0cc3 e38d1ce Author: Cam McKenzie Authored: Mon Aug 11 16:05:58 2014 +1000 Committer: Cam McKenzie Committed: Mon Aug 11 16:05:58 2014 +1000 ---------------------------------------------------------------------- .../discovery/details/DownInstanceManager.java | 11 ++++++--- .../discovery/details/ServiceDiscoveryImpl.java | 26 +++++++++++++++++--- 2 files changed, 31 insertions(+), 6 deletions(-) ----------------------------------------------------------------------