Merge pull request #1300 from akka/wip-3190-netty-3.6.4-patriknw

Change to Netty 3.6.4.Final, see #3190
This commit is contained in:
Patrik Nordwall 2013-04-05 00:44:50 -07:00
commit 7e79bcd4ae

View file

@ -860,7 +860,7 @@ object Dependencies {
val camelCore = "org.apache.camel" % "camel-core" % "2.10.3" exclude("org.slf4j", "slf4j-api") // ApacheV2 val camelCore = "org.apache.camel" % "camel-core" % "2.10.3" exclude("org.slf4j", "slf4j-api") // ApacheV2
val config = "com.typesafe" % "config" % "1.0.0" // ApacheV2 val config = "com.typesafe" % "config" % "1.0.0" // ApacheV2
val netty = "io.netty" % "netty" % "3.6.3.Final" // ApacheV2 val netty = "io.netty" % "netty" % "3.6.4.Final" // ApacheV2
val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" // New BSD val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" // New BSD
val scalaStm = "org.scala-stm" %% "scala-stm" % "0.7" // Modified BSD (Scala) val scalaStm = "org.scala-stm" %% "scala-stm" % "0.7" // Modified BSD (Scala)