cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: merge from 2.0
Date Fri, 13 Dec 2013 23:13:45 GMT
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/fe58dffe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe58dffe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe58dffe

Branch: refs/heads/trunk
Commit: fe58dffef5d4f44255ff47623b7d4d50a2f4e56d
Parents: 74bf5aa c960975
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Dec 13 17:13:33 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Dec 13 17:13:33 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../SizeTieredCompactionStrategy.java           | 21 ++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe58dffe/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4c74ea9,182bada..b673918
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,26 @@@
 +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)
 +
 +
  2.0.4
+  * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
+  * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
   * Fix cleanup ClassCastException (CASSANDRA-6462)
   * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
   * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe58dffe/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------


Mime
View raw message