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/0c56a5ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c56a5ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c56a5ec
Branch: refs/heads/trunk
Commit: 0c56a5ecedc8f0f1d60879b043650402168a14f8
Parents: 0dccea4 2c4b043
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Oct 25 19:11:22 2013 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Oct 25 19:11:22 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/config/CFMetaData.java | 4 ++--
src/java/org/apache/cassandra/config/ColumnDefinition.java | 6 ++++--
3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c56a5ec/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a7671c7,3c96770..549f318
--- 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
+ * Fix modifying column_metadata from thrift (CASSANDRA-6182)
+
+
2.0.2
* Update FailureDetector to use nanontime (CASSANDRA-4925)
* Fix FileCacheService regressions (CASSANDRA-6149)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c56a5ec/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c56a5ec/src/java/org/apache/cassandra/config/ColumnDefinition.java
----------------------------------------------------------------------
