You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2016/07/11 02:59:10 UTC
[4/4] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5712e6e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5712e6e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5712e6e2
Branch: refs/heads/trunk
Commit: 5712e6e2bc619790cc61699aac8ff1958b2ab903
Parents: 09720f8 d20c765
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Jul 11 10:57:42 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Mon Jul 11 10:57:42 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageProxy.java | 7 +------
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5712e6e2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 690b1d6,9df49f3..92c6edb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
+3.10
+ * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
+ * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
+ * Add supplied username to authentication error messages (CASSANDRA-12076)
+ * Remove pre-startup check for open JMX port (CASSANDRA-12074)
+
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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5712e6e2/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------