Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 97807180C4 for ; Fri, 22 Jan 2016 17:58:07 +0000 (UTC) Received: (qmail 21768 invoked by uid 500); 22 Jan 2016 17:58:07 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 21615 invoked by uid 500); 22 Jan 2016 17:58:07 -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 21373 invoked by uid 99); 22 Jan 2016 17:58:07 -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, 22 Jan 2016 17:58:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 27178E0098; Fri, 22 Jan 2016 17:58:07 +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, 22 Jan 2016 17:58:16 -0000 Message-Id: <804ca13f5ab749de969fae768a14889d@git.apache.org> In-Reply-To: <6fb74208dcfe4c97ae1a7f3c9825143c@git.apache.org> References: <6fb74208dcfe4c97ae1a7f3c9825143c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/12] accumulo git commit: Merge branch '1.6' into 1.7 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/edaa44a5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/edaa44a5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/edaa44a5 Branch: refs/heads/1.7 Commit: edaa44a5b265b83c5f34b480657eb7d61e0cdee8 Parents: e5401db d89846e Author: Christopher Tubbs Authored: Fri Jan 22 12:56:07 2016 -0500 Committer: Christopher Tubbs Committed: Fri Jan 22 12:56:07 2016 -0500 ---------------------------------------------------------------------- assemble/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------