You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/03 19:13:08 UTC
[5/5] git commit: Merge branch 'cassandra-2.0' into trunk
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/e01186c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e01186c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e01186c2
Branch: refs/heads/trunk
Commit: e01186c21129d74432355d4262a9c490e6d54dbe
Parents: 5ea3b15 31f6ec1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 3 12:12:57 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 3 12:12:57 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 14 +++----
.../config/YamlConfigurationLoader.java | 43 ++++++++++++++++++--
2 files changed, 46 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e01186c2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 02cb4bc,c09ba86..69cb2e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
+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)
+
2.0.1
+ * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
* Improve leveled compaction's ability to find non-overlapping L0 compactions
to work on concurrently (CASSANDRA-5921)
* Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)