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 999DB200AF8 for ; Thu, 5 May 2016 19:43:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 982B21609F3; Thu, 5 May 2016 17:43:23 +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 C422C160A04 for ; Thu, 5 May 2016 19:43:22 +0200 (CEST) Received: (qmail 84534 invoked by uid 500); 5 May 2016 17:43:22 -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 84383 invoked by uid 99); 5 May 2016 17:43:22 -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, 05 May 2016 17:43:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D999DDFF8E; Thu, 5 May 2016 17:43:21 +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: Thu, 05 May 2016 17:43:23 -0000 Message-Id: In-Reply-To: <24445eee8b0c4ba9a43c8a8a15e433ea@git.apache.org> References: <24445eee8b0c4ba9a43c8a8a15e433ea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.7' archived-at: Thu, 05 May 2016 17:43:23 -0000 Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c044127a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c044127a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c044127a Branch: refs/heads/master Commit: c044127a98a47707d10f55a2c4b28d86d5642a2d Parents: ce7c1fa 160e2c7 Author: Dave Marion Authored: Thu May 5 13:41:38 2016 -0400 Committer: Dave Marion Committed: Thu May 5 13:41:38 2016 -0400 ---------------------------------------------------------------------- assemble/bin/config.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ----------------------------------------------------------------------