You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2016/07/18 15:43:40 UTC
[25/50] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
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/8475f891
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8475f891
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8475f891
Branch: refs/heads/cassandra-3.8
Commit: 8475f891c7576e3816ac450178344a5232b72738
Parents: a006f57 a227cc6
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Jul 7 11:00:37 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Jul 7 11:00:37 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageService.java | 3 +++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8475f891/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1d11149,0e483f1..34e7587
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,7 +1,10 @@@
-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:
* Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
+ 2.2.8
+ * Use dedicated thread for JMX notifications (CASSANDRA-12146)
* 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8475f891/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------