Merge branch 'cassandra-2.1' into trunk

2014-06-17 15:09:31 -04:00 · 2014-06-17 15:09:31 -04:00 · 805a4aeebe
parent 5bd5e25fbb a3dc7b8b41
commit 805a4aeebe
3 changed files with 1 additions and 1 deletions
--- a/build.xml
+++ b/build.xml
@ -378,7 +378,7 @@
          <dependency groupId="com.addthis.metrics" artifactId="reporter-config" version="2.1.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.19.Final" />
+          <dependency groupId="io.netty" artifactId="netty-all" version="4.0.20.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="2.0.1" />
--- a/lib/licenses/netty-all-4.0.20.Final.txt
+++ b/lib/licenses/netty-all-4.0.20.Final.txt
--- a/lib/netty-all-4.0.20.Final.jar
+++ b/lib/netty-all-4.0.20.Final.jar