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/646da9aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/646da9aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/646da9aa Branch: refs/heads/trunk Commit: 646da9aa8f5e0940456d3faaa6aeab6821be311a Parents: 34be4d6 2b8cdc2 Author: Joshua McKenzie <[email protected]> Authored: Fri Dec 4 14:30:52 2015 -0500 Committer: Joshua McKenzie <[email protected]> Committed: Fri Dec 4 14:30:52 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 18 +++----- .../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++ .../cassandra/service/CassandraDaemon.java | 15 ------ .../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++- 5 files changed, 70 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/646da9aa/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 532a77a,e06653f..9a0e5ce --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,6 +1,21 @@@ +3.2 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639) + * Normalize all scripts (CASSANDRA-10679) + * 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: + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) * Handle single-column deletions correction in materialized views when the column is part of the view primary key (CASSANDRA-10796) * Fix issue with datadir migration on upgrade (CASSANDRA-10788) http://git-wip-us.apache.org/repos/asf/cassandra/blob/646da9aa/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/646da9aa/src/java/org/apache/cassandra/db/SystemKeyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/646da9aa/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
