diff --git a/CHANGES.txt b/CHANGES.txt index 472375aecd..cd38da37b6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -16,6 +16,8 @@ * Improve native protocol serialization (CASSANDRA-5664) * Upgrade Thrift to 0.9.1 (CASSANDRA-5923) Merged from 1.2: + * Upgrade metrics-core to version 2.2.0 (CASSANDRA-5947) + * Add snitch, schema version, cluster, partitioner to JMX (CASSANDRA-5881) * Fix CqlRecordWriter with composite keys (CASSANDRA-5949) * Add snitch, schema version, cluster, partitioner to JMX (CASSANDRA-5881) * Allow disabling SlabAllocator (CASSANDRA-5935) diff --git a/lib/licenses/metrics-core-2.0.3.txt b/lib/licenses/metrics-core-2.2.0.txt similarity index 100% rename from lib/licenses/metrics-core-2.0.3.txt rename to lib/licenses/metrics-core-2.2.0.txt diff --git a/lib/metrics-core-2.0.3.jar b/lib/metrics-core-2.2.0.jar similarity index 57% rename from lib/metrics-core-2.0.3.jar rename to lib/metrics-core-2.2.0.jar index 729e6e8e52..0f6d1cb0ec 100644 Binary files a/lib/metrics-core-2.0.3.jar and b/lib/metrics-core-2.2.0.jar differ