merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70f7574a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70f7574a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70f7574a Branch: refs/heads/trunk Commit: 70f7574a43c364f5658adb15d5649bc18b9da0cc Parents: e9a6783 6a211f4 Author: Jonathan Ellis <[email protected]> Authored: Sat Dec 28 00:17:38 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Sat Dec 28 00:17:38 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ .../org/apache/cassandra/io/compress/CompressionMetadata.java | 7 ++++++- src/java/org/apache/cassandra/io/util/SequentialWriter.java | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70f7574a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8716150,0396006..0974925 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,8 +1,31 @@@ +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) + * Secondary index support for collections (CASSANDRA-4511) + * SSTable metadata(Stats.db) format change (CASSANDRA-6356) + * Push composites support in the storage engine (CASSANDRA-5417) + * Add snapshot space used to cfstats (CASSANDRA-6231) + * Add cardinality estimator for key count estimation (CASSANDRA-5906) + + + 2.0.5 + Merged from 1.2: + * fsync compression metadata (CASSANDRA-6531) + + 2.0.4 * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418) * add StorageService.stopDaemon() (CASSANDRA-4268)
