Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ad17634 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ad17634 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ad17634 Branch: refs/heads/cassandra-3.8 Commit: 5ad17634a1fb75d09ab5a6cb234d7460fed0c3e0 Parents: 262cd38 dd05e46 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed Jul 6 12:10:41 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Wed Jul 6 12:10:41 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad17634/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index afeef2c,02786c5..2861cf7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.9 +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 potential race when rebuilding CFMetaData (CASSANDRA-12098) * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996) * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944) * Fix column ordering of results with static columns for Thrift requests in http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad17634/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/CFMetaData.java index caa2059,5678ada..4708033 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@@ -22,10 -22,8 +22,9 @@@ import java.lang.reflect.Constructor import java.lang.reflect.InvocationTargetException; import java.nio.ByteBuffer; import java.util.*; - import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting;
