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/5de5d06a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5de5d06a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5de5d06a Branch: refs/heads/trunk Commit: 5de5d06a47c7f81d52d9ca24928368ada9364bf5 Parents: 918bc01 4c56c89 Author: Sam Tunnicliffe <[email protected]> Authored: Mon Nov 30 12:19:09 2015 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Mon Nov 30 12:19:09 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../org/apache/cassandra/config/CFMetaData.java | 14 +++-- .../org/apache/cassandra/config/Schema.java | 8 +-- .../apache/cassandra/cql3/QueryProcessor.java | 4 +- .../cassandra/service/MigrationListener.java | 4 +- .../cassandra/service/MigrationManager.java | 4 +- .../org/apache/cassandra/transport/Server.java | 2 +- .../validation/entities/SecondaryIndexTest.java | 62 +++++++++++++------- .../index/internal/CassandraIndexTest.java | 8 --- 9 files changed, 62 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de5d06a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bb1b5d7,0356045..57769db --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,6 @@@ - -3.0.1 +3.1 +Merged from 3.0: + * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758) * Fix SELECT statement with IN restrictions on partition key, ORDER BY and LIMIT (CASSANDRA-10729) * Improve stress performance over 1k threads (CASSANDRA-7217)
