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 6399B114E6 for ; Tue, 8 Jul 2014 15:52:16 +0000 (UTC) Received: (qmail 45529 invoked by uid 500); 8 Jul 2014 15:52:16 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 45428 invoked by uid 500); 8 Jul 2014 15:52:16 -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 45337 invoked by uid 99); 8 Jul 2014 15:52:16 -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, 08 Jul 2014 15:52:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B70C0946699; Tue, 8 Jul 2014 15:52:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vines@apache.org To: commits@accumulo.apache.org Date: Tue, 08 Jul 2014 15:52:17 -0000 Message-Id: <3b8ea3704de746868baf78ae0e3330f7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6.1-SNAPSHOT' Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/20ce2efa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/20ce2efa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/20ce2efa Branch: refs/heads/master Commit: 20ce2efa4738c5839cddb0acab637acba246023c Parents: 49d3554 01da4f4 Author: John Vines Authored: Tue Jul 8 11:52:08 2014 -0400 Committer: John Vines Committed: Tue Jul 8 11:52:08 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/server/metrics/AbstractMetricsImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/20ce2efa/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java ---------------------------------------------------------------------- diff --cc server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java index e805244,16b4bb8..05ede64 --- a/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java @@@ -31,7 -30,9 +31,8 @@@ import javax.management.MBeanServer import javax.management.ObjectName; import javax.management.StandardMBean; -import org.apache.accumulo.core.Constants; import org.apache.commons.lang.builder.ToStringBuilder; + import org.apache.commons.lang.builder.ToStringStyle; import org.apache.commons.lang.time.DateUtils; public abstract class AbstractMetricsImpl {