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/6cb5da88
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cb5da88
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cb5da88
Branch: refs/heads/trunk
Commit: 6cb5da88a3703de57a118e063adde453b53a68f9
Parents: dba12f3 2629e5e
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Tue Oct 22 16:49:32 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Tue Oct 22 16:49:32 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cb5da88/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cf1a384,c01b4a8..407c317
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,7 +1,16 @@@
+2.1
+ * 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)
+
+
+ 2.0.3
+ * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
+
+
2.0.2
* Update FailureDetector to use nanontime (CASSANDRA-4925)
* Fix FileCacheService regressions (CASSANDRA-6149)
