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 A9C721150E for ; Wed, 18 Jun 2014 14:30:04 +0000 (UTC) Received: (qmail 99336 invoked by uid 500); 18 Jun 2014 14:30:04 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 99298 invoked by uid 500); 18 Jun 2014 14:30:04 -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 99269 invoked by uid 99); 18 Jun 2014 14:30:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2014 14:30:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3C98183BADE; Wed, 18 Jun 2014 14:30:04 +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: Wed, 18 Jun 2014 14:30:06 -0000 Message-Id: <507cd185a6c24de29911a5b06dec0819@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/7] git commit: Merge branch 'CURATOR-114' of github.com:cammckenzie/curator into CURATOR-114 Merge branch 'CURATOR-114' of github.com:cammckenzie/curator into CURATOR-114 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2337b64f Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2337b64f Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2337b64f Branch: refs/heads/CURATOR-114 Commit: 2337b64fc5a1cfbbcbe462560cb0a8d2fef22c0a Parents: 5d7d0c7 61eb388 Author: randgalt Authored: Tue Jun 17 23:01:35 2014 -0500 Committer: randgalt Committed: Tue Jun 17 23:01:35 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/curator/BasicTests.java | 2 +- .../java/org/apache/curator/TestRetryLoop.java | 2 +- .../framework/imps/TestFailedDeleteManager.java | 12 +- .../curator/framework/imps/TestFramework.java | 2 +- .../framework/imps/TestFrameworkEdges.java | 2 +- .../recipes/leader/TestLeaderLatch.java | 2 +- .../recipes/leader/TestLeaderSelector.java | 2 +- .../locks/TestInterProcessMutexBase.java | 2 +- .../org/apache/curator/test/TestingServer.java | 114 ++++++++++++++++--- .../curator/test/TestingZooKeeperServer.java | 98 +++++++++------- .../x/discovery/TestServiceDiscovery.java | 5 +- 11 files changed, 171 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/2337b64f/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderLatch.java ----------------------------------------------------------------------