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/57516e08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57516e08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57516e08 Branch: refs/heads/trunk Commit: 57516e082b71a761513767107e76e5eb19c49253 Parents: ab9fe1a 6724964 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Dec 2 21:39:20 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Dec 2 21:39:20 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.sh | 3 +++ src/java/org/apache/cassandra/gms/VersionedValue.java | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/57516e08/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bb3a98a,11f4c09..3bc50ac --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ +2.1 + * Multithreaded commitlog (CASSANDRA-3578) + * allocate fixed index summary memory pool and resample cold index summaries + to use less memory (CASSANDRA-5519) + * Removed multithreaded compaction (CASSANDRA-6142) + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * 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) + * Remove CFDefinition (CASSANDRA-6253) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + + 2.0.4 + * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410) * Allow specifying datacenters to participate in a repair (CASSANDRA-6218) * Fix divide-by-zero in PCI (CASSANDRA-6403) * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
