Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4111e4fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4111e4fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4111e4fd Branch: refs/heads/trunk Commit: 4111e4fdf982462619145761d80d109bf1d78fa2 Parents: b80a31d be38081 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Thu Mar 31 15:40:16 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Thu Mar 31 15:40:16 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/statements/CreateIndexStatement.java | 11 ++++++++--- .../cql3/validation/entities/SecondaryIndexTest.java | 4 ++++ 3 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4111e4fd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d645925,7fc628e..b542a67 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.5 +3.5 + * Avoid index segment stitching in RAM which lead to OOM on big SSTable files (CASSANDRA-11383) + * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397) +Merged from 3.0: + * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131) * Upgrade ohc to 0.4.3 * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093) * Allocate merkletrees with the correct size (CASSANDRA-11390) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4111e4fd/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4111e4fd/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java ----------------------------------------------------------------------
