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/23156863
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23156863
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23156863
Branch: refs/heads/trunk
Commit: 23156863d8c3ab8a8ea490a0cd7c76af63a5e994
Parents: b1d1fac 7453e6f
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Thu Sep 19 18:14:23 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Thu Sep 19 18:14:23 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23156863/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4254d70,fcc33f2..fe652f6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,15 @@@
+2.1
+ * 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.2
+ * Make ThriftServer more easlly extensible (CASSANDRA-6058)
+
+
2.0.1
* add file_cache_size_in_mb setting (CASSANDRA-5661)
* Improve error message when yaml contains invalid properties
(CASSANDRA-5958)
