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 D038111A61 for ; Wed, 20 Aug 2014 21:47:22 +0000 (UTC) Received: (qmail 64774 invoked by uid 500); 20 Aug 2014 21:47:22 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 64693 invoked by uid 500); 20 Aug 2014 21:47:22 -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 64670 invoked by uid 99); 20 Aug 2014 21:47:22 -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, 20 Aug 2014 21:47:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 69FF3982971; Wed, 20 Aug 2014 21:47:22 +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: Wed, 20 Aug 2014 21:47:23 -0000 Message-Id: In-Reply-To: <90acfc70755a4c84a9eae4022b3253dc@git.apache.org> References: <90acfc70755a4c84a9eae4022b3253dc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] git commit: Merge branch 'CURATOR-84' of https://github.com/karkum/curator into CURATOR-84 Merge branch 'CURATOR-84' of https://github.com/karkum/curator into CURATOR-84 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/475a3b00 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/475a3b00 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/475a3b00 Branch: refs/heads/CURATOR-84 Commit: 475a3b00a08dab6b5b6beb192ebe91039277a443 Parents: 0d1397a 882f541 Author: Cam McKenzie Authored: Wed Aug 20 16:49:16 2014 +1000 Committer: Cam McKenzie Committed: Wed Aug 20 16:49:16 2014 +1000 ---------------------------------------------------------------------- .../framework/recipes/locks/InterProcessMutex.java | 17 ++++++++++++++++- .../framework/recipes/locks/LockInternals.java | 9 +-------- .../recipes/locks/LockInternalsDriver.java | 4 +++- .../framework/recipes/locks/PredicateResults.java | 8 ++++---- .../recipes/locks/StandardLockInternalsDriver.java | 17 +++++++++++++++++ 5 files changed, 41 insertions(+), 14 deletions(-) ----------------------------------------------------------------------