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 CFBA8200B8F for ; Thu, 15 Sep 2016 21:33:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CD3F5160ABA; Thu, 15 Sep 2016 19:33:12 +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 601CB160AE3 for ; Thu, 15 Sep 2016 21:33:11 +0200 (CEST) Received: (qmail 94093 invoked by uid 500); 15 Sep 2016 19:33:10 -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 93771 invoked by uid 99); 15 Sep 2016 19:33:10 -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, 15 Sep 2016 19:33:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0A6DBEEF49; Thu, 15 Sep 2016 19:33:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Thu, 15 Sep 2016 19:33:20 -0000 Message-Id: <2d6fe627128d4966a5e5cd9cb90f1f2c@git.apache.org> In-Reply-To: <0918cbebcd2a4d4883da848c9ab98170@git.apache.org> References: <0918cbebcd2a4d4883da848c9ab98170@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/13] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Thu, 15 Sep 2016 19:33:12 -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/4ce03388 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ce03388 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ce03388 Branch: refs/heads/1.8 Commit: 4ce033889eebc6974498483499842852512bb773 Parents: 923c87e 896aa4a Author: Christopher Tubbs Authored: Thu Sep 15 15:13:01 2016 -0400 Committer: Christopher Tubbs Committed: Thu Sep 15 15:13:01 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------