merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f5eb84b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f5eb84b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f5eb84b Branch: refs/heads/trunk Commit: 8f5eb84b66e217c0d74ac83764beda35b279ef8e Parents: 494cc32 7e59db2 Author: Jonathan Ellis <[email protected]> Authored: Mon Sep 23 09:13:34 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Sep 23 09:13:34 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 +++ .../cassandra/io/sstable/ColumnNameHelper.java | 26 ++++++++++++++------ .../apache/cassandra/utils/ByteBufferUtil.java | 6 +++++ 3 files changed, 28 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f5eb84b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index da728d7,6df5559..fe81e20 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -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 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + + 2.0.1 * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025) * Improve memory use defaults (CASSANDRA-5069)
