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/ac926233
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac926233
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac926233
Branch: refs/heads/trunk
Commit: ac926233ffd69338818c606f4e703c8fc3331792
Parents: fdbddc1 3c9760b
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Nov 22 09:56:33 2013 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Nov 22 09:56:33 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 8 +-
.../service/pager/AbstractQueryPager.java | 80 +++++++++++++-------
2 files changed, 56 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac926233/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 06628a0,8163c94..79e5880
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,3 +1,18 @@@
+2.1
+ * 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
- * remove RF from nodetool ring output (CASSANDRA-6289)
- * fix attempting to flush empty rows (CASSANDRA-6374)
-
-
2.0.3
* Fix FD leak on slice read path (CASSANDRA-6275)
* Cancel read meter task when closing SSTR (CASSANDRA-6358)
