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 89995179F9 for ; Mon, 3 Nov 2014 23:33:58 +0000 (UTC) Received: (qmail 53776 invoked by uid 500); 3 Nov 2014 23:33:58 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 53731 invoked by uid 500); 3 Nov 2014 23:33:58 -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 53709 invoked by uid 99); 3 Nov 2014 23:33:58 -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, 03 Nov 2014 23:33:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D266AA06717; Mon, 3 Nov 2014 23:33:57 +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, 03 Nov 2014 23:33:58 -0000 Message-Id: In-Reply-To: <35548cee234d4edfb7f408de9082cc8a@git.apache.org> References: <35548cee234d4edfb7f408de9082cc8a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] git commit: Merge branch 'CURATOR-140' of https://github.com/sqrrldata/curator into CURATOR-140 Merge branch 'CURATOR-140' of https://github.com/sqrrldata/curator into CURATOR-140 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/fe879313 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/fe879313 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/fe879313 Branch: refs/heads/CURATOR-140 Commit: fe879313d638f70be8911499a244f85ddbe7af9a Parents: 1c194b4 77a1afb Author: Cameron McKenzie Authored: Thu Oct 30 09:32:32 2014 +1100 Committer: Cameron McKenzie Committed: Thu Oct 30 09:32:32 2014 +1100 ---------------------------------------------------------------------- .../locks/InterProcessReadWriteLock.java | 34 +++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) ----------------------------------------------------------------------