From 8ed1f5765c9b114b768a2d802800ef2892ee8757 Mon Sep 17 00:00:00 2001 From: Frank Schroeder Date: Tue, 12 Jul 2016 21:44:59 +0200 Subject: [PATCH] Prepare for release 1.2rc3 --- CHANGELOG.md | 12 +++++++++--- README.md | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d52fb81d5..1c269a6e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,19 @@ ## Changelog -### [v1.2rc2](https://github.com/eBay/fabio/releases/tag/v1.2rc2) - 23 Jun 2016 +### [v1.2rc3](https://github.com/eBay/fabio/releases/tag/v1.2rc3) - 12 Jul 2016 - * [PR #117](https://github.com/eBay/fabio/pull/117): Allow routes to a service in warning status + * [Issue #108](https://github.com/eBay/fabio/issues/108): TLS handshake error: failed to verify client's certificate + * [Issue #122](https://github.com/eBay/fabio/issues/122): X-Forwarded-Port should use local port -### [v1.1.6](https://github.com/eBay/fabio/releases/tag/v1.1.6) - Unreleased +### [v1.1.6](https://github.com/eBay/fabio/releases/tag/v1.1.6) - 12 Jul 2016 + * [Issue #108](https://github.com/eBay/fabio/issues/108): TLS handshake error: failed to verify client's certificate * [Issue #122](https://github.com/eBay/fabio/issues/122): X-Forwarded-Port should use local port +### [v1.2rc2](https://github.com/eBay/fabio/releases/tag/v1.2rc2) - 23 Jun 2016 + + * [PR #117](https://github.com/eBay/fabio/pull/117): Allow routes to a service in warning status + ### [v1.1.5](https://github.com/eBay/fabio/releases/tag/v1.1.5) - 23 Jun 2016 * [PR #117](https://github.com/eBay/fabio/pull/117): Allow routes to a service in warning status diff --git a/README.md b/README.md index 733487864..6fecb2321 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # ![./fabio](https://github.com/eBay/fabio/blob/master/fabio.png) -##### Current stable version: 1.1.5 +##### Current stable version: 1.1.6 -##### Next version: 1.2rc2 +##### Next version: 1.2rc3 [![Build Status](https://travis-ci.org/eBay/fabio.svg?branch=master)](https://travis-ci.org/eBay/fabio) [![License MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/eBay/fabio/master/LICENSE)