cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Date Tue, 01 Oct 2013 19:26:07 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 023589bf3049c7960fd13ac069300ee2952893ea
Parents: ca697d5 32c3f44
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Oct 1 14:25:57 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Oct 1 14:25:57 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 NEWS.txt                                        |   2 +
 build.xml                                       |   2 +
 conf/metrics-reporter-config-sample.yaml        |  41 +++++
 lib/licenses/reporter-config-2.1.0.txt          | 177 +++++++++++++++++++
 lib/reporter-config-2.1.0.jar                   | Bin 0 -> 22291 bytes
 .../cassandra/service/CassandraDaemon.java      |  18 ++
 7 files changed, 241 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/023589bf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e22b6cf,80aed13..0750853
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +2.1
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 +
 +
  2.0.2
+  * Add configurable metrics reporting (CASSANDRA-4430)
   * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
   * Track and persist sstable read activity (CASSANDRA-5515)
   * Fixes for speculative retry (CASSANDRA-5932)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/023589bf/NEWS.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/023589bf/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 5be1fbc,4be1d10..60801a4
--- a/build.xml
+++ b/build.xml
@@@ -458,10 -453,12 +459,11 @@@
          <dependency groupId="edu.stanford.ppl" artifactId="snaptree"/>
          <dependency groupId="org.mindrot" artifactId="jbcrypt"/>
          <dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
+         <dependency groupId="com.addthis.metrics" artifactId="reporter-config"/>
          <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.2"/>
  
 -        <dependency groupId="log4j" artifactId="log4j"/>
 -        <!-- cassandra has a hard dependency on log4j, so force slf4j's log4j provider
at runtime -->
 -        <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" scope="runtime"/>
 +        <dependency groupId="ch.qos.logback" artifactId="logback-core"/>
 +        <dependency groupId="ch.qos.logback" artifactId="logback-classic"/>
  
          <dependency groupId="org.apache.thrift" artifactId="libthrift"/>
          <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/023589bf/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------


Mime
View raw message