Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af4799b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af4799b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af4799b5 Branch: refs/heads/trunk Commit: af4799b52121991147ba54bf530228b54d645ea2 Parents: eb125ad 5817aa9 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Sep 23 17:13:47 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Sep 23 17:13:47 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af4799b5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 61d1482,43bb25c..143efd4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,13 @@@ +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 - * Move batchlog replay to its own executor (CASSANDRA-6079) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) * Fix insertion of collections with CAS (CASSANDRA-6069) Merged from 1.2:
