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/59ee46e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59ee46e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59ee46e5 Branch: refs/heads/cassandra-3.8 Commit: 59ee46e55a15775a49edde86de81b9b79875731d Parents: 5ad1763 778f2a4 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Jul 6 12:34:22 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Jul 6 12:34:22 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/ConnectionHandler.java | 8 ++-- .../cassandra/streaming/StreamReceiveTask.java | 50 +++++++++++++++----- .../cassandra/streaming/StreamSession.java | 17 +++++-- .../streaming/StreamingTransferTest.java | 30 ++++++++++-- 5 files changed, 83 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59ee46e5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2861cf7,8118de1..d459e34 --- 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: + * Improve streaming synchronization and fault tolerance (CASSANDRA-11414) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/59ee46e5/src/java/org/apache/cassandra/streaming/ConnectionHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59ee46e5/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59ee46e5/src/java/org/apache/cassandra/streaming/StreamSession.java ----------------------------------------------------------------------