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/7a06b393
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a06b393
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a06b393

Branch: refs/heads/trunk
Commit: 7a06b39300df9cf271837f6dbeb30dad5db54c8c
Parents: 299ab74 2aa7663
Author: T Jake Luciani <j...@apache.org>
Authored: Mon Jul 18 10:55:47 2016 -0400
Committer: T Jake Luciani <j...@apache.org>
Committed: Mon Jul 18 10:55:47 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                             |   3 +-
 build.xml                               |   2 +-
 lib/licenses/netty-all-4.0.36.Final.txt | 202 ---------------------------
 lib/licenses/netty-all-4.0.39.Final.txt | 202 +++++++++++++++++++++++++++
 lib/netty-all-4.0.36.Final.jar          | Bin 2195921 -> 0 bytes
 lib/netty-all-4.0.39.Final.jar          | Bin 0 -> 2271610 bytes
 6 files changed, 205 insertions(+), 204 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a06b393/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f8c9964,3307fb3..54a5281
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,4 +1,19 @@@
 +3.10
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts 
(CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * 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/7a06b393/build.xml
----------------------------------------------------------------------

Reply via email to