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/64309eeb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64309eeb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64309eeb Branch: refs/heads/trunk Commit: 64309eeb8adebc5106c4e51da22b2f4920f1385e Parents: bbab80f 5176ce7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Sep 23 09:31:50 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Sep 23 09:31:50 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/64309eeb/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index be19c73,bae83ca..9917ec1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,9 +1,17 @@@ +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) + Merged from 1.2: + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Allow where clause conditions to be in parenthesis (CASSANDRA-6037) + * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916) * Improve memory usage of metadata min/max column names (CASSANDRA-6077)