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 2AE0D200CD6 for ; Mon, 31 Jul 2017 21:55:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 29B02165D33; Mon, 31 Jul 2017 19:55:45 +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 624EB165D34 for ; Mon, 31 Jul 2017 21:55:44 +0200 (CEST) Received: (qmail 30546 invoked by uid 500); 31 Jul 2017 19:55:43 -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 30521 invoked by uid 99); 31 Jul 2017 19:55:43 -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; Mon, 31 Jul 2017 19:55:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 60422F3317; Mon, 31 Jul 2017 19:55:43 +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: Mon, 31 Jul 2017 19:55:47 -0000 Message-Id: <3fb10da89e134c4aa95ffb6bdf3cf087@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Mon, 31 Jul 2017 19:55:45 -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/0ee13f25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0ee13f25 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0ee13f25 Branch: refs/heads/1.8 Commit: 0ee13f25cc56b3ca92449f840065ee2eef34c113 Parents: 67f5e95 7619532 Author: Josh Elser Authored: Mon Jul 31 15:55:13 2017 -0400 Committer: Josh Elser Committed: Mon Jul 31 15:55:13 2017 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------