diff --git a/CHANGES b/CHANGES index 5b8831ad9c..9385b16428 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,9 @@ Note that ``RB_ID=#`` correspond to associated messages in commits. 6.x ----- +6.31.0 +~~~~~~~ + New Features ~~~~~~~~~~~~ @@ -535,7 +538,7 @@ New Features * finagle-core: improved Java compatiblity for `c.t.f.Stack.Params` / `c.t.f.Stack.Parameterized`. - * finagle-core: Introduce the ability to add metadata to bound `com.twitter.finagle.Addr`\s. + * finagle-core: Introduce the ability to add metadata to bound `com.twitter.finagle.Addr`s. * finagle-core: Introduce per-address latency compensation. Clients may be configured with a 'Compensator' function that uses the client's address metadata to adjust connection and diff --git a/doc/src/sphinx/code/client-server-anatomy/build.sbt b/doc/src/sphinx/code/client-server-anatomy/build.sbt index 7e07f8280f..ddf6b09f8d 100644 --- a/doc/src/sphinx/code/client-server-anatomy/build.sbt +++ b/doc/src/sphinx/code/client-server-anatomy/build.sbt @@ -2,8 +2,8 @@ name := "client-server-anatomy" version := "1.0" -scalaVersion := "2.10.5" +scalaVersion := "2.11.7" libraryDependencies ++= Seq( - "com.twitter" %% "finagle-core" % "6.28.0" + "com.twitter" %% "finagle-core" % "6.31.0" ) diff --git a/doc/src/sphinx/code/protocols/build.sbt b/doc/src/sphinx/code/protocols/build.sbt index baa51bf510..f11a960046 100644 --- a/doc/src/sphinx/code/protocols/build.sbt +++ b/doc/src/sphinx/code/protocols/build.sbt @@ -2,8 +2,8 @@ name := "protocols" version := "1.0" -scalaVersion := "2.10.5" +scalaVersion := "2.11.7" libraryDependencies ++= Seq( - "com.twitter" %% "finagle-mysql" % "6.28.0" + "com.twitter" %% "finagle-mysql" % "6.31.0" ) diff --git a/doc/src/sphinx/code/quickstart/build.sbt b/doc/src/sphinx/code/quickstart/build.sbt index 5989d711ac..a6d4137188 100644 --- a/doc/src/sphinx/code/quickstart/build.sbt +++ b/doc/src/sphinx/code/quickstart/build.sbt @@ -2,6 +2,6 @@ name := "quickstart" version := "1.0" -scalaVersion := "2.10.5" +scalaVersion := "2.11.7" -libraryDependencies += "com.twitter" %% "finagle-http" % "6.30.0" +libraryDependencies += "com.twitter" %% "finagle-http" % "6.31.0" diff --git a/project/Build.scala b/project/Build.scala index 84aa9eecdf..b6bbe52d42 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -13,10 +13,10 @@ object Finagle extends Build { val branch = Process("git" :: "rev-parse" :: "--abbrev-ref" :: "HEAD" :: Nil).!!.trim val suffix = if (branch == "master") "" else "-SNAPSHOT" - val libVersion = "6.30.0" + suffix - val utilVersion = "6.29.0" + suffix - val ostrichVersion = "9.13.0" + suffix - val scroogeVersion = "4.2.0" + suffix + val libVersion = "6.31.0" + suffix + val utilVersion = "6.30.0" + suffix + val ostrichVersion = "9.14.0" + suffix + val scroogeVersion = "4.3.0" + suffix val nettyLib = "io.netty" % "netty" % "3.10.1.Final" val netty4Libs = Seq(