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/bbab80ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbab80ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbab80ff Branch: refs/heads/trunk Commit: bbab80ff32b8abd44dbc427693d12bcc5408fa4c Parents: 8f5eb84 5dc5086 Author: Jonathan Ellis <[email protected]> Authored: Mon Sep 23 09:22:06 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Sep 23 09:22:06 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/BatchlogManager.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbab80ff/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fe81e20,0403381..be19c73 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -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)
