cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Tue, 16 Jun 2015 22:45:53 GMT
Merge branch 'cassandra-2.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a8be785
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a8be785
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a8be785

Branch: refs/heads/trunk
Commit: 7a8be785070f8df6cf8b35dce01e19474fc8e351
Parents: 74cef19 514dcd9
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Jun 16 17:43:39 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Jun 16 17:43:39 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 conf/logback.xml                                |   9 +-
 lib/licenses/metrics-logback-3.1.0.txt          | 202 +++++++++++++++++++
 lib/metrics-logback-3.1.0.jar                   | Bin 0 -> 4130 bytes
 .../metrics/CassandraMetricsRegistry.java       |  23 +--
 .../cassandra/service/CassandraDaemon.java      |  25 ++-
 6 files changed, 240 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a8be785/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a8be785/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index ccd11ca,59ecca7..b954e50
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -36,8 -37,11 +37,12 @@@ import javax.management.remote.JMXConne
  import javax.management.remote.JMXServiceURL;
  import javax.management.remote.rmi.RMIConnectorServer;
  
+ import com.codahale.metrics.Meter;
+ import com.codahale.metrics.MetricRegistryListener;
+ import com.codahale.metrics.SharedMetricRegistries;
  import com.google.common.util.concurrent.Uninterruptibles;
 +import org.apache.cassandra.gms.Gossiper;
+ import org.apache.cassandra.metrics.DefaultNameFactory;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  


Mime
View raw message