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 976FF17601 for ; Thu, 23 Apr 2015 14:32:48 +0000 (UTC) Received: (qmail 88439 invoked by uid 500); 23 Apr 2015 14:32:48 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 88396 invoked by uid 500); 23 Apr 2015 14:32:48 -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 88246 invoked by uid 99); 23 Apr 2015 14:32:48 -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, 23 Apr 2015 14:32:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 42B60E17BD; Thu, 23 Apr 2015 14:32:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Thu, 23 Apr 2015 14:32:50 -0000 Message-Id: <086f9eaf629a42cfad1c569709c37dfc@git.apache.org> In-Reply-To: <812f57e2d2cd4940b81dc1a8f01e7642@git.apache.org> References: <812f57e2d2cd4940b81dc1a8f01e7642@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/11] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/33ef1e02 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33ef1e02 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33ef1e02 Branch: refs/heads/1.7 Commit: 33ef1e027643b3e9cfa82b9b2a4e7c48353d3f7f Parents: 4e88af7 f76acc6 Author: Christopher Tubbs Authored: Tue Apr 21 19:31:49 2015 -0400 Committer: Christopher Tubbs Committed: Tue Apr 21 19:31:49 2015 -0400 ---------------------------------------------------------------------- core/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/33ef1e02/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/33ef1e02/minicluster/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/33ef1e02/pom.xml ----------------------------------------------------------------------