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 68337200B21 for ; Thu, 26 May 2016 21:14:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6720A160A17; Thu, 26 May 2016 19:14:24 +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 2EBE8160A3F for ; Thu, 26 May 2016 21:14:23 +0200 (CEST) Received: (qmail 88854 invoked by uid 500); 26 May 2016 19:14: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 88701 invoked by uid 99); 26 May 2016 19:14: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, 26 May 2016 19:14:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C827EE2C29; Thu, 26 May 2016 19:14:21 +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, 26 May 2016 19:14:30 -0000 Message-Id: <6af7639a0b644ba6bbda3d3e89f5bb1f@git.apache.org> In-Reply-To: <74fa2882923d418d9cb557a20a63ada3@git.apache.org> References: <74fa2882923d418d9cb557a20a63ada3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/13] accumulo git commit: Merge branch '1.6' into 1.7 archived-at: Thu, 26 May 2016 19:14:24 -0000 Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d7716d32 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d7716d32 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d7716d32 Branch: refs/heads/1.7 Commit: d7716d3257bbf4eae630204b03dfb9e24c453d1a Parents: 906d932 dbb2840 Author: Christopher Tubbs Authored: Thu May 26 14:36:48 2016 -0400 Committer: Christopher Tubbs Committed: Thu May 26 14:36:48 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------