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/dc956751 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc956751 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc956751 Branch: refs/heads/trunk Commit: dc956751f8338acd049cfc85c7d67032fdba136e Parents: 5bbcaa4 9aebf9d Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Nov 24 21:23:47 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Nov 24 21:23:47 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/serializers/TimestampSerializer.java | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc956751/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3fdb8e7,46f592e..eb0bc91 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,7 +1,23 @@@ +2.1 + * 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) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + + 2.0.4 - * Fix divide-by-zero in PCI (CASSANDRA-6403) * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) + * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395) 2.0.3
