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 6E1A6104FA for ; Fri, 10 Jan 2014 16:29:20 +0000 (UTC) Received: (qmail 87270 invoked by uid 500); 10 Jan 2014 16:29:09 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 87147 invoked by uid 500); 10 Jan 2014 16:29:04 -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 87092 invoked by uid 99); 10 Jan 2014 16:29:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jan 2014 16:29:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DDFF18B5FF4; Fri, 10 Jan 2014 16:29:01 +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: Fri, 10 Jan 2014 16:29:04 -0000 Message-Id: <0ba5898c59204d0da49acf263658e453@git.apache.org> In-Reply-To: <6d1404b2f5064907a806a2dd0b074d6c@git.apache.org> References: <6d1404b2f5064907a806a2dd0b074d6c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24e62a08 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24e62a08 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24e62a08 Branch: refs/heads/master Commit: 24e62a088df03d40cab6bd01b063e17e096e97d5 Parents: 2af2515 b4a832d Author: Eric Newton Authored: Fri Jan 10 10:14:57 2014 -0500 Committer: Eric Newton Committed: Fri Jan 10 10:14:57 2014 -0500 ---------------------------------------------------------------------- .../maven/plugin/AbstractAccumuloMojo.java | 13 +++++++++- .../minicluster/MiniAccumuloCluster.java | 4 +--- .../minicluster/MiniAccumuloConfig.java | 20 ++-------------- .../minicluster/MiniAccumuloClusterGCTest.java | 25 -------------------- .../minicluster/MiniAccumuloClusterTest.java | 4 ++-- pom.xml | 2 +- 6 files changed, 18 insertions(+), 50 deletions(-) ----------------------------------------------------------------------