accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Tue, 08 Jul 2014 15:52:17 GMT
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 <vines@apache.org>
Authored: Tue Jul 8 11:52:08 2014 -0400
Committer: John Vines <vines@apache.org>
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 {


Mime
View raw message