cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Thu, 09 Feb 2017 20:13:42 GMT
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0811824a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0811824a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0811824a

Branch: refs/heads/trunk
Commit: 0811824abbf46182005c5c54cee7b08243f2057a
Parents: 4550734 6d5cd2d
Author: Robert Stupp <snazy@snazy.de>
Authored: Thu Feb 9 21:13:14 2017 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Thu Feb 9 21:13:14 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 build.xml                                       |   2 +-
 lib/licenses/netty-all-4.0.39.Final.txt         | 202 -------------------
 lib/licenses/netty-all-4.0.44.Final.txt         | 202 +++++++++++++++++++
 lib/netty-all-4.0.39.Final.jar                  | Bin 2271610 -> 0 bytes
 lib/netty-all-4.0.44.Final.jar                  | Bin 0 -> 2342652 bytes
 .../org/apache/cassandra/transport/Message.java |   6 +-
 7 files changed, 209 insertions(+), 205 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0811824a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2217659,3073fd7..38f1209
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -44,6 -13,6 +44,8 @@@ Merged from 3.0
     live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
     for a table that's in system_schema.tables (CASSANDRA-13180)
++Merged from 2.1:
++ * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114)
  
  
  3.10

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0811824a/build.xml
----------------------------------------------------------------------


Mime
View raw message