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/7c3e0b19 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c3e0b19 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c3e0b19 Branch: refs/heads/trunk Commit: 7c3e0b191f5b535a212866925d57a23e81b063de Parents: c92dab5 60aeef3 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Tue Dec 1 18:15:59 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Tue Dec 1 18:16:08 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/DeleteStatement.java | 6 ++++++ .../cassandra/cql3/validation/operations/DeleteTest.java | 8 ++++++++ 3 files changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c3e0b19/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c91066a,ed66b69..60aaa49 --- 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: + * Rejects partition range deletions when columns are specified (CASSANDRA-10739) * 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,
