cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Date Tue, 01 Dec 2015 09:28:35 GMT
Merge branch 'cassandra-3.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cc34dfe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cc34dfe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cc34dfe

Branch: refs/heads/trunk
Commit: 2cc34dfef2246d9202eaf12f966c34cc0cd32376
Parents: 19ff0e4 3e53152
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Dec 1 10:28:25 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Dec 1 10:28:25 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                      |  1 +
 .../apache/cassandra/service/CacheService.java   |  4 ++++
 .../cassandra/io/sstable/LegacySSTableTest.java  | 19 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc34dfe/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c69cdf5,99777ec..c91066a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,19 @@@
 +3.2
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created (CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.1
  Merged from 3.0:
+  * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
   * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
   * Fix SELECT statement with IN restrictions on partition key,
     ORDER BY and LIMIT (CASSANDRA-10729)


Mime
View raw message