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 ADD95200B82 for ; Fri, 12 Aug 2016 03:27:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AC6AB160A94; Fri, 12 Aug 2016 01:27:01 +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 E745E160AB8 for ; Fri, 12 Aug 2016 03:27:00 +0200 (CEST) Received: (qmail 10038 invoked by uid 500); 12 Aug 2016 01:27:00 -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 9886 invoked by uid 99); 12 Aug 2016 01:27:00 -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, 12 Aug 2016 01:27:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D6EE9E094C; Fri, 12 Aug 2016 01:26:59 +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: Fri, 12 Aug 2016 01:27:03 -0000 Message-Id: <9d52868f9451465ab02733a191e393a4@git.apache.org> In-Reply-To: <15589bac09e64981b3672c2429d4adb7@git.apache.org> References: <15589bac09e64981b3672c2429d4adb7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/10] accumulo git commit: Merge branch '1.6' into 1.7 archived-at: Fri, 12 Aug 2016 01:27:01 -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/4885470e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4885470e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4885470e Branch: refs/heads/1.8 Commit: 4885470e465970d9ae5db0cb06d3ef656bac6e25 Parents: 78638cb e1cd01f Author: Christopher Tubbs Authored: Thu Aug 11 21:24:49 2016 -0400 Committer: Christopher Tubbs Committed: Thu Aug 11 21:24:49 2016 -0400 ---------------------------------------------------------------------- assemble/build.sh | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4885470e/assemble/build.sh ----------------------------------------------------------------------