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 302B4200B34 for ; Sat, 18 Jun 2016 00:01:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2EF40160A61; Fri, 17 Jun 2016 22:01:42 +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 44BFA160A67 for ; Sat, 18 Jun 2016 00:01:41 +0200 (CEST) Received: (qmail 81640 invoked by uid 500); 17 Jun 2016 22:01:40 -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 81317 invoked by uid 99); 17 Jun 2016 22:01:40 -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; Fri, 17 Jun 2016 22:01:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 25788EC22A; Fri, 17 Jun 2016 22:01:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@accumulo.apache.org Date: Fri, 17 Jun 2016 22:01:47 -0000 Message-Id: <7e0622a81fc64b6f8a59e3977cd4906c@git.apache.org> In-Reply-To: <79eee92cfd6b416a98312a467ca68a1b@git.apache.org> References: <79eee92cfd6b416a98312a467ca68a1b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Fri, 17 Jun 2016 22:01:42 -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/519e5b79 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/519e5b79 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/519e5b79 Branch: refs/heads/1.8 Commit: 519e5b790ad091c0c15afd3d7b8a5ed92098947b Parents: e811851 7b92053 Author: Sean Busbey Authored: Fri Jun 17 17:00:49 2016 -0500 Committer: Sean Busbey Committed: Fri Jun 17 17:00:49 2016 -0500 ---------------------------------------------------------------------- LICENSE | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) ----------------------------------------------------------------------