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 00B55200CCA for ; Tue, 13 Jun 2017 21:45:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F3927160BC5; Tue, 13 Jun 2017 19:45:35 +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 388D0160BEC for ; Tue, 13 Jun 2017 21:45:35 +0200 (CEST) Received: (qmail 18345 invoked by uid 500); 13 Jun 2017 19:45:34 -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 18193 invoked by uid 99); 13 Jun 2017 19:45:34 -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, 13 Jun 2017 19:45:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0EA03E0EE6; Tue, 13 Jun 2017 19:45:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mwalch@apache.org To: commits@accumulo.apache.org Date: Tue, 13 Jun 2017 19:45:37 -0000 Message-Id: <5cf53e2ae03b4bc49d24a71c7f385b21@git.apache.org> In-Reply-To: <4afac3bf963c4390927d94143e65df25@git.apache.org> References: <4afac3bf963c4390927d94143e65df25@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Tue, 13 Jun 2017 19:45:36 -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/2b72e7c9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2b72e7c9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2b72e7c9 Branch: refs/heads/1.8 Commit: 2b72e7c96dec1723c969ee04fca6d29c6e3140a4 Parents: 3a00511 d1591f0 Author: Mike Walch Authored: Tue Jun 13 15:42:53 2017 -0400 Committer: Mike Walch Committed: Tue Jun 13 15:42:53 2017 -0400 ---------------------------------------------------------------------- assemble/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------