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/db07b20e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db07b20e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db07b20e Branch: refs/heads/trunk Commit: db07b20edbcd2a23b0669e64e466cd13ce47e2f3 Parents: c2294aa de19f96 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jan 8 20:54:51 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jan 8 20:54:51 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/db/ConsistencyLevel.java | 59 +++++++++++++------- .../locator/AbstractReplicationStrategy.java | 2 +- .../cassandra/service/CassandraDaemon.java | 51 ++++++++++++++++- 4 files changed, 92 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db07b20e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 58a0906,e96a8e0..0a8b9b9 --- 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 + * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) * Delete unfinished compaction incrementally (CASSANDRA-6086) * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480) Merged from 1.2: http://git-wip-us.apache.org/repos/asf/cassandra/blob/db07b20e/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java index ccabad5,d497a38..260dcb2 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@@ -30,8 -32,10 +30,8 @@@ import javax.management.ObjectName import javax.management.StandardMBean; import com.addthis.metrics.reporter.config.ReporterConfig; -- import com.google.common.collect.Iterables; + import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.log4j.PropertyConfigurator; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
