diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 928714fbec..7cb9132a85 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,9 @@ Note that ``PHAB_ID=#`` and ``RB_ID=#`` correspond to associated messages in com Unreleased ---------- +20.1.0 +------ + New Features ~~~~~~~~~~~~ * finagle-memcached: Upgrade to Bijection 0.9.7. ``PHAB_ID=D426488`` diff --git a/README.md b/README.md index a84f3997d7..9513b5763d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ # Finagle -[![Build status](https://travis-ci.org/twitter/finagle.svg?branch=develop)](https://travis-ci.org/twitter/finagle) +[![Build status](https://travis-ci.org/twitter/finagle.svg?branch=master)](https://travis-ci.org/twitter/finagle) [![Codecov](https://codecov.io/gh/twitter/finagle/branch/develop/graph/badge.svg)](https://codecov.io/gh/twitter/finagle) [![Project status](https://img.shields.io/badge/status-active-brightgreen.svg)](#status) [![Gitter](https://badges.gitter.im/twitter/finagle.svg)](https://gitter.im/twitter/finagle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) diff --git a/build.sbt b/build.sbt index e2d71adab4..a0517186cc 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ import Tests._ import scoverage.ScoverageKeys // All Twitter library releases are date versioned as YY.MM.patch -val releaseVersion = "20.1.0-SNAPSHOT" +val releaseVersion = "20.1.0" val libthriftVersion = "0.10.0" diff --git a/doc/src/sphinx/code/client-server-anatomy/build.sbt b/doc/src/sphinx/code/client-server-anatomy/build.sbt index 2b91726c4d..ce574f7087 100644 --- a/doc/src/sphinx/code/client-server-anatomy/build.sbt +++ b/doc/src/sphinx/code/client-server-anatomy/build.sbt @@ -5,5 +5,5 @@ version := "1.0" scalaVersion := "2.12.1" libraryDependencies ++= Seq( - "com.twitter" %% "finagle-core" % "19.12.0" + "com.twitter" %% "finagle-core" % "20.1.0" ) diff --git a/doc/src/sphinx/code/protocols/build.sbt b/doc/src/sphinx/code/protocols/build.sbt index c24b75497f..17f61cd25f 100644 --- a/doc/src/sphinx/code/protocols/build.sbt +++ b/doc/src/sphinx/code/protocols/build.sbt @@ -5,5 +5,5 @@ version := "1.0" scalaVersion := "2.12.1" libraryDependencies ++= Seq( - "com.twitter" %% "finagle-mysql" % "19.12.0" + "com.twitter" %% "finagle-mysql" % "20.1.0" ) diff --git a/doc/src/sphinx/code/quickstart/build.sbt b/doc/src/sphinx/code/quickstart/build.sbt index e81762a5de..aa35573bef 100644 --- a/doc/src/sphinx/code/quickstart/build.sbt +++ b/doc/src/sphinx/code/quickstart/build.sbt @@ -4,4 +4,4 @@ version := "1.0" scalaVersion := "2.12.1" -libraryDependencies += "com.twitter" %% "finagle-http" % "19.12.0" +libraryDependencies += "com.twitter" %% "finagle-http" % "20.1.0" diff --git a/project/plugins.sbt b/project/plugins.sbt index ed72ba9163..6afc2f11b2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ resolvers += Classpaths.sbtPluginReleases resolvers += Resolver.sonatypeRepo("snapshots") -val releaseVersion = "20.1.0-SNAPSHOT" +val releaseVersion = "20.1.0" addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % releaseVersion)