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/9fb436f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fb436f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fb436f9 Branch: refs/heads/trunk Commit: 9fb436f936d9dc9740273b147c9c4a960638affc Parents: 646da9a ee46dfb Author: T Jake Luciani <[email protected]> Authored: Fri Dec 4 15:54:15 2015 -0500 Committer: T Jake Luciani <[email protected]> Committed: Fri Dec 4 15:54:15 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/view/ViewUtils.java | 25 ++------ .../apache/cassandra/service/StorageProxy.java | 67 ++++++++++++-------- .../apache/cassandra/db/view/ViewUtilsTest.java | 42 ++++++++++-- 4 files changed, 88 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fb436f9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9a0e5ce,a2e9434..0511ed4 --- 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: + * Avoid MV race during node decommission (CASSANDRA-10674) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fb436f9/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
