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/3d5eea5b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d5eea5b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d5eea5b Branch: refs/heads/trunk Commit: 3d5eea5b87b1c9842f69aec8ea12d61253207284 Parents: 6947e19 49427cd Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jan 16 16:40:13 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jan 16 16:40:13 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d5eea5b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4c0c4d8,76c020a..10fedf4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,5 +1,32 @@@ +2.1 + * Introduce AtomicBTreeColumns (CASSANDRA-6271) + * 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) + * Secondary index support for collections (CASSANDRA-4511, 6383) + * SSTable metadata(Stats.db) format change (CASSANDRA-6356) + * Push composites support in the storage engine + (CASSANDRA-5417, CASSANDRA-6520) + * Add snapshot space used to cfstats (CASSANDRA-6231) + * Add cardinality estimator for key count estimation (CASSANDRA-5906) + * CF id is changed to be non-deterministic. Data dir/key cache are created + uniquely for CF id (CASSANDRA-5202) + + 2.0.5 + * Add ks.cf names to tombstone logging (CASSANDRA-6597) * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495) * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) * Delete unfinished compaction incrementally (CASSANDRA-6086) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d5eea5b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java ----------------------------------------------------------------------
