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/56abaca0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56abaca0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56abaca0 Branch: refs/heads/trunk Commit: 56abaca0466411739895523d0c3a81a7630ab9f0 Parents: 371a147 5861cd8 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Jul 11 15:00:33 2016 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Jul 11 15:01:04 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 7 +++---- src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56abaca0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f65b1f4,70210a8..da8216f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,4 +1,9 @@@ -3.0.9 +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)
