From 5f4f8b8b9420082468fb99c95e90fd5f924e09e5 Mon Sep 17 00:00:00 2001
From: Nik Shkrob <nshkrob@twitter.com>
Date: Mon, 28 Sep 2015 17:53:38 +0000
Subject: [PATCH] Release CSL libraries (Sept 2015).

- Release finagle, ostrich, scrooge, twitter-server, util (Sept 2015).

RB_ID=747942
---
 CHANGES             | 34 +++++++++++++++++-----------------
 project/Build.scala |  8 ++++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6e3fe84af9..a1c04c1aec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@ Note that ``RB_ID=#`` correspond to associated messages in commits.
 6.x
 -----
 
+6.29.0
+~~~~~~
+
 Deprecations
 ~~~~~~~~~~~~
 
@@ -15,7 +18,7 @@ Deprecations
 New Features
 ~~~~~~~~~~~~
 
-   * finagle-core: Provides a `RetryFilter` which takes a
+  * finagle-core: Provides a `RetryFilter` which takes a
     `RetryPolicy[(Req, Try[Rep])]` and allows you to retry on both "successful"
     requests, such as HTTP 500s, as well as failed requests. The `Req`
     parameterization facilitates using the request to determine if retrying is
@@ -24,19 +27,6 @@ New Features
   * finagle-httpx: Experimental support `multipart/form-data` (file uploads)
     decoding via `c.t.f.httpx.exp.Multipart`. ``RB_ID=730102``
 
-Breaking API Changes
-~~~~~~~~~~~~~~~~~~~~
-
-  * finagle-core: `RetryingFilter`, which takes a RetryPolicy[Try[Nothing]]` and
-    is invoked only on exceptions, has been renamed to `RetryExceptionsFilter`.
-    `RetryExceptionsFilter` is a subclass of `RetryFilter`, which takes a
-    `RetryPolicy[(Req, Try[Rep])]` and allows you to retry on both "successful"
-    requests, such as HTTP 500s, as well as failed requests. The `Req`
-    parameterization facilitates using the request to determine if retrying is
-    safe (i.e. the request is idempotent).
-
-  * finagle-core: Name.all is now private to `com.twitter.finagle`.
-
 Runtime Behavior Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -58,14 +48,24 @@ Runtime Behavior Changes
 Breaking API Changes
 ~~~~~~~~~~~~~~~~~~~~
 
+  * finagle-core: `RetryingFilter`, which takes a RetryPolicy[Try[Nothing]]` and
+    is invoked only on exceptions, has been renamed to `RetryExceptionsFilter`.
+    `RetryExceptionsFilter` is a subclass of `RetryFilter`, which takes a
+    `RetryPolicy[(Req, Try[Rep])]` and allows you to retry on both "successful"
+    requests, such as HTTP 500s, as well as failed requests. The `Req`
+    parameterization facilitates using the request to determine if retrying is
+    safe (i.e. the request is idempotent).
+
+  * finagle-core: Name.all is now private to `com.twitter.finagle`.
+
   * finagle-memcached: Unified stack-based construction APIs and cleanup internal
     constructors. In particular, `KetamaClient` was removed and `KetamaPartitionClient`
     and `KetamaFailureAccrualFactory` are now sealed inside Finagle. See
     [[com.twitter.finagle.Memcached]] for how to construct a finagle-memcached client.
 
- * finagle-redis: Port the c.t.f.Redis protocol object to the StackClient API.
-   A redis client can now be constructed and configured like the rest of the
-   finagle subprojects.
+  * finagle-redis: Port the c.t.f.Redis protocol object to the StackClient API.
+    A redis client can now be constructed and configured like the rest of the
+    finagle subprojects.
 
 6.28.0
 ------
diff --git a/project/Build.scala b/project/Build.scala
index 62d5531d76..b9678c8688 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.28.0" + suffix
-  val utilVersion = "6.27.0" + suffix
-  val ostrichVersion = "9.11.0" + suffix
-  val scroogeVersion = "4.0.0" + suffix
+  val libVersion = "6.29.0" + suffix
+  val utilVersion = "6.28.0" + suffix
+  val ostrichVersion = "9.12.0" + suffix
+  val scroogeVersion = "4.1.0" + suffix
 
   val nettyLib = "io.netty" % "netty" % "3.10.1.Final"
   val ostrichLib = "com.twitter" %% "ostrich" % ostrichVersion