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 DAA8611368 for ; Fri, 23 May 2014 15:07:02 +0000 (UTC) Received: (qmail 7352 invoked by uid 500); 23 May 2014 15:07:02 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 7248 invoked by uid 500); 23 May 2014 15:07: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 7118 invoked by uid 99); 23 May 2014 15:07:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2014 15:07:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7254A9A47A4; Fri, 23 May 2014 15:07: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: Fri, 23 May 2014 15:07:04 -0000 Message-Id: <41fa2f46c59d408384ecbd28b1cf80b9@git.apache.org> In-Reply-To: <4c52c9a752f84f3cb1c1fa8c60e52b3d@git.apache.org> References: <4c52c9a752f84f3cb1c1fa8c60e52b3d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/29] git commit: Merge branch 'master' into CURATOR-96 Merge branch 'master' into CURATOR-96 Conflicts: curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/c6d5f21b Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/c6d5f21b Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/c6d5f21b Branch: refs/heads/CURATOR-105 Commit: c6d5f21b012e6c8407dfa5d5871c03eb1eae014b Parents: 568c699 2ef7181 Author: randgalt Authored: Wed Apr 2 21:22:35 2014 -0500 Committer: randgalt Committed: Wed Apr 2 21:22:35 2014 -0500 ---------------------------------------------------------------------- .../framework/recipes/locks/ChildReaper.java | 19 +- .../curator/framework/recipes/locks/Reaper.java | 96 +++++++-- .../framework/recipes/locks/TestReaper.java | 200 ++++++++++++------- 3 files changed, 228 insertions(+), 87 deletions(-) ----------------------------------------------------------------------