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 7121618D05 for ; Tue, 5 Jan 2016 22:32:32 +0000 (UTC) Received: (qmail 62703 invoked by uid 500); 5 Jan 2016 22:32:32 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 62636 invoked by uid 500); 5 Jan 2016 22:32:32 -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 62560 invoked by uid 99); 5 Jan 2016 22:32:32 -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; Tue, 05 Jan 2016 22:32:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EC4D8E00B1; Tue, 5 Jan 2016 22:32:31 +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: Tue, 05 Jan 2016 22:32:35 -0000 Message-Id: <89132a20d19646ad94918565248a5ee1@git.apache.org> In-Reply-To: <6dd77c7aa3eb4a4397a103242aa768f3@git.apache.org> References: <6dd77c7aa3eb4a4397a103242aa768f3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/8] 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/46e27b2e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46e27b2e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46e27b2e Branch: refs/heads/master Commit: 46e27b2e28b88cb40fe6c334e8ee979033969d4d Parents: ff08336 288a2e1 Author: Christopher Tubbs Authored: Tue Jan 5 16:24:30 2016 -0500 Committer: Christopher Tubbs Committed: Tue Jan 5 16:24:30 2016 -0500 ---------------------------------------------------------------------- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/46e27b2e/pom.xml ----------------------------------------------------------------------