Repository: cassandra Updated Branches: refs/heads/trunk ccacf7d1a -> a0d070764
upgrade netty to 4.0.36 patch by tjake; reviewed by Jason Brown for CASSANDRA-11567 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0d07076 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0d07076 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0d07076 Branch: refs/heads/trunk Commit: a0d070764ab9cf0a1eb16d7ffd7d57cbcefd2a82 Parents: ccacf7d Author: T Jake Luciani <j...@apache.org> Authored: Wed Apr 13 13:49:53 2016 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Thu Apr 14 10:31:53 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- lib/netty-all-4.0.34.Final.jar | Bin 2144516 -> 0 bytes lib/netty-all-4.0.36.Final.jar | Bin 0 -> 2195921 bytes 4 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0d07076/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 329e55c..43d1c3c 100644 --- 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0d07076/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index c6b2246..034fb29 100644 --- 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" /> http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0d07076/lib/netty-all-4.0.34.Final.jar ---------------------------------------------------------------------- diff --git a/lib/netty-all-4.0.34.Final.jar b/lib/netty-all-4.0.34.Final.jar deleted file mode 100644 index 590b429..0000000 Binary files a/lib/netty-all-4.0.34.Final.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0d07076/lib/netty-all-4.0.36.Final.jar ---------------------------------------------------------------------- diff --git a/lib/netty-all-4.0.36.Final.jar b/lib/netty-all-4.0.36.Final.jar new file mode 100644 index 0000000..5e278c4 Binary files /dev/null and b/lib/netty-all-4.0.36.Final.jar differ
