Merge branch cassandra-3.9 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71f3c91d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71f3c91d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71f3c91d Branch: refs/heads/trunk Commit: 71f3c91d142daf10fbd9d1e99d5e111d4be8bf96 Parents: 73b5cab 7107646 Author: Pavel Yaskevich <xe...@apache.org> Authored: Mon Jul 4 21:26:29 2016 -0700 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Mon Jul 4 21:26:29 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/index/sasi/disk/OnDiskIndex.java | 7 ++++ .../cassandra/index/sasi/plan/Expression.java | 11 ------ .../unit/org/apache/cassandra/SchemaLoader.java | 35 +++++++++++++++++++ .../cassandra/index/sasi/SASIIndexTest.java | 30 +++++++++++++++- .../index/sasi/disk/OnDiskIndexTest.java | 36 ++++++++++++++++++++ 6 files changed, 108 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71f3c91d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8726a45,68854b3..290a2d1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ +3.10 + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + 3.9 + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) * Increase size of flushExecutor thread pool (CASSANDRA-12071) Merged from 3.0: * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)