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 650831728C for ; Thu, 11 Jun 2015 21:50:06 +0000 (UTC) Received: (qmail 13449 invoked by uid 500); 11 Jun 2015 21:50:01 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 13356 invoked by uid 500); 11 Jun 2015 21:50:01 -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 13096 invoked by uid 99); 11 Jun 2015 21:50:01 -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, 11 Jun 2015 21:50:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 00D5DE04AC; Thu, 11 Jun 2015 21:50:00 +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, 11 Jun 2015 21:50:10 -0000 Message-Id: In-Reply-To: <8f560cd858ec472d976526cd04071d16@git.apache.org> References: <8f560cd858ec472d976526cd04071d16@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/13] accumulo git commit: Merge branch '1.6' into 1.7 Merge branch '1.6' into 1.7 Conflicts: CHANGES Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a7c79d3d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a7c79d3d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a7c79d3d Branch: refs/heads/1.7 Commit: a7c79d3d6c620831bed8df9718e1201f5b6f4f7d Parents: 5312fac ddd3932 Author: Christopher Tubbs Authored: Thu Jun 11 17:49:31 2015 -0400 Committer: Christopher Tubbs Committed: Thu Jun 11 17:49:31 2015 -0400 ---------------------------------------------------------------------- assemble/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a7c79d3d/assemble/build.sh ----------------------------------------------------------------------