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/371a1479 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/371a1479 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/371a1479 Branch: refs/heads/trunk Commit: 371a147945feeaea9d39a714d59847eed1b3dc22 Parents: 314f60a 4d7141f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Jul 11 14:37:10 2016 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Jul 11 14:37:10 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/CompactTables.java | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/371a1479/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 44fe26c,4241da8..f65b1f4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.9 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) +Merged from 3.0: 3.0.9 + * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) * Fix reverse queries ignoring range tombstones (CASSANDRA-11733) 2.2.8 http://git-wip-us.apache.org/repos/asf/cassandra/blob/371a1479/src/java/org/apache/cassandra/db/CompactTables.java ----------------------------------------------------------------------