merge from 1.2

2013-08-30 13:55:06 -05:00 · 2013-08-30 13:55:06 -05:00 · 2be4241380
parent e7693fa92d de1a91fe5e
commit 2be4241380
3 changed files with 2 additions and 0 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -12,6 +12,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)
--- a/lib/licenses/metrics-core-2.2.0.txt
+++ b/lib/licenses/metrics-core-2.2.0.txt
--- a/lib/metrics-core-2.2.0.jar
+++ b/lib/metrics-core-2.2.0.jar