cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [8/8] git commit: Merge branch 'cassandra-2.0' into trunk
Date Tue, 17 Sep 2013 22:18:08 GMT
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/5fc48bd3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fc48bd3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fc48bd3

Branch: refs/heads/trunk
Commit: 5fc48bd3aff67baf7e548382db278cba1d491cba
Parents: 494ba45 88e3977
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Sep 17 17:17:54 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Sep 17 17:17:54 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fc48bd3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 61844d0,46e1b43..0bf7889
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +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.1
+  * add file_cache_size_in_mb setting (CASSANDRA-5661)
   * 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)


Mime
View raw message