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/09/01 21:34:56 UTC
[4/6] 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/27df1bdd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27df1bdd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27df1bdd
Branch: refs/heads/trunk
Commit: 27df1bdd225b6cdd125f34d805b751b618b8b417
Parents: d4884c7 3380fa7
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Sep 1 14:34:38 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Sep 1 14:34:38 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageProxy.java | 9 +++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/27df1bdd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ee55941,89f66a8..82fea75
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,19 @@@
-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:
+ * Allow local batchlog writes for CL.ANY (CASSANDRA-5967)
+ * Optimize name query performance in wide rows (CASSANDRA-5966)
* 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/27df1bdd/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------