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 C70EC200B92 for ; Tue, 23 Aug 2016 16:11:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C5920160AA5; Tue, 23 Aug 2016 14:11:26 +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 F017D160ABF for ; Tue, 23 Aug 2016 16:11:25 +0200 (CEST) Received: (qmail 64255 invoked by uid 500); 23 Aug 2016 14:11:25 -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 64192 invoked by uid 99); 23 Aug 2016 14:11:25 -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; Tue, 23 Aug 2016 14:11:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 11CB3E08AF; Tue, 23 Aug 2016 14:11:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dlmarion@apache.org To: commits@accumulo.apache.org Date: Tue, 23 Aug 2016 14:11:27 -0000 Message-Id: <528fce616092469bb8c210c5afe70d00@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/4] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Tue, 23 Aug 2016 14:11:26 -0000 Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/271800c3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/271800c3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/271800c3 Branch: refs/heads/master Commit: 271800c36dd7199d1744c8eb7ab7c87907108352 Parents: 8b24701 ffd5028 Author: Dave Marion Authored: Tue Aug 23 09:57:07 2016 -0400 Committer: Dave Marion Committed: Tue Aug 23 09:57:07 2016 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/server/util/ZooZap.java | 27 ++++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) ----------------------------------------------------------------------