cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 31 Oct 2013 13:43:15 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/d64aa99a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d64aa99a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d64aa99a

Branch: refs/heads/trunk
Commit: d64aa99a99f1539cbba3904acbefcb98eef1de14
Parents: ddb8bc6 7015a7a
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Oct 31 08:43:07 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Oct 31 08:43:07 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                             |  1 +
 src/java/org/apache/cassandra/service/CacheService.java | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d64aa99a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8271e08,9a44d8e..ee4704c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +2.1
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * 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)
 + * Remove CFDefinition (CASSANDRA-6253)
 +
 +
  2.0.3
+  * Skip loading corrupt key cache (CASSANDRA-6260)
   * Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
   * Compact hottest sstables first and optionally omit coldest from
     compaction entirely (CASSANDRA-6109)


Mime
View raw message