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 25372200B85 for ; Wed, 10 Aug 2016 23:50:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2403B160AA4; Wed, 10 Aug 2016 21:50:14 +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 EC5CF160ABC for ; Wed, 10 Aug 2016 23:50:12 +0200 (CEST) Received: (qmail 1232 invoked by uid 500); 10 Aug 2016 21:50:12 -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 1032 invoked by uid 99); 10 Aug 2016 21:50:12 -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; Wed, 10 Aug 2016 21:50:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D5EC8E5725; Wed, 10 Aug 2016 21:50:11 +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: Wed, 10 Aug 2016 21:50:20 -0000 Message-Id: <516b8fb229454d9b92b73ea1c0edd0cf@git.apache.org> In-Reply-To: <17e41f8198154aa4b31f5d4818b6c916@git.apache.org> References: <17e41f8198154aa4b31f5d4818b6c916@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] accumulo git commit: Merge branch '1.8' archived-at: Wed, 10 Aug 2016 21:50:14 -0000 Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6a8a43f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6a8a43f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6a8a43f6 Branch: refs/heads/master Commit: 6a8a43f66bbc77cad5d385a98b78869b5bf8aeb5 Parents: 71fde9e e6d1ee2 Author: Christopher Tubbs Authored: Wed Aug 10 17:49:38 2016 -0400 Committer: Christopher Tubbs Committed: Wed Aug 10 17:49:38 2016 -0400 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------