Merge branch 'cassandra-2.0' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1152e4b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1152e4b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1152e4b3
Branch: refs/heads/trunk
Commit: 1152e4b3924603106313130ca396e9d0027a6b5e
Parents: d365faa 21bb531
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Wed Dec 18 22:10:39 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Wed Dec 18 22:10:39 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
doc/cql3/CQL.textile | 10 +++++++++-
src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1152e4b3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 08e96fb,b876204..7074d2a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,3 +1,25 @@@
+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)
+
+
2.0.4
* Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
* Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1152e4b3/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
