upgrade netty to 4.0.36

patch by tjake; reviewed by Jason Brown for CASSANDRA-11567
2016-04-13 13:49:53 -04:00 · 2016-04-13 13:49:53 -04:00 · a0d070764a
parent ccacf7d1a9
commit a0d070764a
3 changed files with 2 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -1,4 +1,5 @@
 3.6
+ * Update Netty to 4.0.36 (CASSANDRA-11567)
 * Fix PER PARTITION LIMIT for queries requiring post-query ordering (CASSANDRA-11556)
 * Allow instantiation of UDTs and tuples in UDFs (CASSANDRA-10818)
 * Support UDT in CQLSSTableWriter (CASSANDRA-10624)
--- a/build.xml
+++ b/build.xml
@ -411,7 +411,7 @@
          <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.0" />
          <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" />
          <dependency groupId="io.airlift" artifactId="airline" version="0.6" />
-          <dependency groupId="io.netty" artifactId="netty-all" version="4.0.34.Final" />
+          <dependency groupId="io.netty" artifactId="netty-all" version="4.0.36.Final" />
          <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" />
          <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" />
          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.0" classifier="shaded" />
--- a/lib/netty-all-4.0.36.Final.jar
+++ b/lib/netty-all-4.0.36.Final.jar