Merge branch 'cassandra-1.2' into cassandra-2.0

2013-09-03 16:35:27 +02:00 · 2013-09-03 16:35:27 +02:00 · 14e7895e59
parent c7a835d1f4 196038b73e
commit 14e7895e59
3 changed files with 1 additions and 1 deletions
--- a/build.xml
+++ b/build.xml
@ -375,7 +375,7 @@
          <dependency groupId="com.yammer.metrics" artifactId="metrics-core" version="2.2.0" />
          <dependency groupId="edu.stanford.ppl" artifactId="snaptree" version="0.1" />
          <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" />
-          <dependency groupId="io.netty" artifactId="netty" version="3.5.9.Final" />
+          <dependency groupId="io.netty" artifactId="netty" version="3.6.6.Final" />
        </dependencyManagement>
        <developer id="alakshman" name="Avinash Lakshman"/>
        <developer id="antelder" name="Anthony Elder"/>
--- a/lib/netty-3.5.9.Final.jar
+++ b/lib/netty-3.5.9.Final.jar
--- a/lib/netty-3.6.6.Final.jar
+++ b/lib/netty-3.6.6.Final.jar