You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/30 20:56:03 UTC
[5/7] git commit: merge from 1.2
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2be42413
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2be42413
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2be42413
Branch: refs/heads/cassandra-2.0
Commit: 2be42413809b60968ed8b8301dd9a473f03f8885
Parents: e7693fa de1a91f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 30 13:55:06 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 30 13:55:06 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
lib/licenses/metrics-core-2.0.3.txt | 202 -------------------------------
lib/licenses/metrics-core-2.2.0.txt | 202 +++++++++++++++++++++++++++++++
lib/metrics-core-2.0.3.jar | Bin 80800 -> 0 bytes
lib/metrics-core-2.2.0.jar | Bin 0 -> 82123 bytes
5 files changed, 204 insertions(+), 202 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2be42413/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 863214c,777d0d1..ee55941
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,7 +1,21 @@@
-1.2.10
+2.0.1
+ * Improve leveled compaction's ability to find non-overlapping L0 compactions
+ to work on concurrently (CASSANDRA-5921)
+ * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
+ * Log Merkle tree stats (CASSANDRA-2698)
+ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
+ * Improve offheap memcpy performance (CASSANDRA-5884)
+ * Use a range aware scanner for cleanup (CASSANDRA-2524)
+ * Cleanup doesn't need to inspect sstables that contain only local data
+ (CASSANDRA-5722)
+ * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
+ * 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)
* Make user-defined compaction JMX blocking (CASSANDRA-4952)
* Fix streaming does not transfer wrapped range (CASSANDRA-5948)