Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60aeef3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60aeef3d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60aeef3d Branch: refs/heads/trunk Commit: 60aeef3d663d18243b19e56b9f1f9d95a1d28908 Parents: 924fb4d 3864b21 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Tue Dec 1 18:14:58 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Tue Dec 1 18:14:58 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/60aeef3d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 99777ec,7fffbbf..ed66b69 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.1 +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,
