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 4989810160 for ; Tue, 2 Dec 2014 20:36:52 +0000 (UTC) Received: (qmail 97173 invoked by uid 500); 2 Dec 2014 20:36:51 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 97104 invoked by uid 500); 2 Dec 2014 20:36:51 -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 95337 invoked by uid 99); 2 Dec 2014 20:36:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2014 20:36:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D05F39BC008; Tue, 2 Dec 2014 20:36:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Tue, 02 Dec 2014 20:37:35 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [47/50] [abbrv] accumulo git commit: Merge branch '1.6' Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/54475e5c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/54475e5c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/54475e5c Branch: refs/heads/metrics2 Commit: 54475e5c15434eabfcbe130fdad157536642f21f Parents: 692312b 3bb20cd Author: Christopher Tubbs Authored: Mon Dec 1 19:34:48 2014 -0500 Committer: Christopher Tubbs Committed: Mon Dec 1 19:34:48 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/cluster/AccumuloCluster.java | 4 ---- .../java/org/apache/accumulo/cluster/RemoteShellOptions.java | 2 +- .../test/java/org/apache/accumulo/harness/AccumuloClusterIT.java | 2 -- .../java/org/apache/accumulo/harness/MiniClusterHarness.java | 4 ---- 4 files changed, 1 insertion(+), 11 deletions(-) ----------------------------------------------------------------------