Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7BF87200AE4 for ; Thu, 26 May 2016 06:32:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7B11F160A34; Thu, 26 May 2016 04:32:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C0C50160A29 for ; Thu, 26 May 2016 06:32:41 +0200 (CEST) Received: (qmail 45417 invoked by uid 500); 26 May 2016 04:32:41 -0000 Mailing-List: contact commits-help@helix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@helix.apache.org Delivered-To: mailing list commits@helix.apache.org Received: (qmail 45381 invoked by uid 99); 26 May 2016 04:32:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2016 04:32:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 16602DFE65; Thu, 26 May 2016 04:32:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishoreg@apache.org To: commits@helix.apache.org Date: Thu, 26 May 2016 04:32:41 -0000 Message-Id: In-Reply-To: <9aa325bf78d84801a6f73291893cfc3b@git.apache.org> References: <9aa325bf78d84801a6f73291893cfc3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] helix git commit: Merge branch '0.7.1-bugfix' of https://github.com/neutronsharc/helix archived-at: Thu, 26 May 2016 04:32:42 -0000 Merge branch '0.7.1-bugfix' of https://github.com/neutronsharc/helix Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/f011ea3e Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/f011ea3e Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/f011ea3e Branch: refs/heads/master Commit: f011ea3ee6e9f3477b93795b23ef545476ae1601 Parents: 196675c 6ecac13 Author: Kishore Gopalakrishna Authored: Wed May 25 21:31:47 2016 -0700 Committer: Kishore Gopalakrishna Committed: Wed May 25 21:31:47 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/helix/lock/zk/WriteLock.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ----------------------------------------------------------------------