Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BDB911EAF for ; Tue, 24 Jun 2014 18:39:49 +0000 (UTC) Received: (qmail 70308 invoked by uid 500); 24 Jun 2014 18:39:49 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 70274 invoked by uid 500); 24 Jun 2014 18:39:49 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 70264 invoked by uid 99); 24 Jun 2014 18:39:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2014 18:39:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F055F98C8FC; Tue, 24 Jun 2014 18:39:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Tue, 24 Jun 2014 18:39:53 -0000 Message-Id: <98044e437d9c4462bcd15d2951307365@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch '1.6.1-SNAPSHOT' Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc6e7769 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc6e7769 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc6e7769 Branch: refs/heads/master Commit: dc6e7769444fdbe368004f6cbe598e168417e012 Parents: 9defedf cfda8fa Author: Josh Elser Authored: Tue Jun 24 14:25:43 2014 -0400 Committer: Josh Elser Committed: Tue Jun 24 14:25:43 2014 -0400 ---------------------------------------------------------------------- .../accumulo/fate/zookeeper/ZooLockTest.java | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) ----------------------------------------------------------------------