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 30FC3200B45 for ; Fri, 10 Jun 2016 00:41:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2FB59160A58; Thu, 9 Jun 2016 22:41:13 +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 6D530160A59 for ; Fri, 10 Jun 2016 00:41:12 +0200 (CEST) Received: (qmail 88698 invoked by uid 500); 9 Jun 2016 22:41:06 -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 88525 invoked by uid 99); 9 Jun 2016 22:41:06 -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, 09 Jun 2016 22:41:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A16D0E964F; Thu, 9 Jun 2016 22:41:06 +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: Thu, 09 Jun 2016 22:41:13 -0000 Message-Id: <0878f9d0923b4365a88aa80a9ea9e3f4@git.apache.org> In-Reply-To: <87937756bebb413c8b9b956343d24e98@git.apache.org> References: <87937756bebb413c8b9b956343d24e98@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Thu, 09 Jun 2016 22:41:13 -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/cb25e77a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cb25e77a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cb25e77a Branch: refs/heads/1.8 Commit: cb25e77a2df29a7839a1d77357c4e6e6beafb82f Parents: 6a5a817 462dfbc Author: Josh Elser Authored: Thu Jun 9 18:40:45 2016 -0400 Committer: Josh Elser Committed: Thu Jun 9 18:40:45 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------