From c7bdf9e3927cdcae7db3fe48d0d7c3b582d64541 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 15 Jun 2017 17:05:23 -0700
Subject: [PATCH] Bump 1.14.0

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 CHANGELOG.md        | 5 ++++-
 compose/__init__.py | 2 +-
 script/run/run.sh   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02e439e4f5..cced3804ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Change log
 ==========
 
-1.14.0 (2017-06-06)
+1.14.0 (2017-06-19)
 -------------------
 
 ### New features
@@ -41,6 +41,9 @@ Change log
 - Fixed a bug where `cache_from` in the build section would be ignored when
   using more than one Compose file.
 
+- Fixed a bug that prevented binding the same port to different IPs when
+  using more than one Compose file.
+
 - Fixed a bug where override files would not be picked up by Compose if they
   had the `.yaml` extension
 
diff --git a/compose/__init__.py b/compose/__init__.py
index 9bbae98d5f..f6ed1f463b 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.14.0-rc2'
+__version__ = '1.14.0'
diff --git a/script/run/run.sh b/script/run/run.sh
index ef2f63d8ff..e4a2f4199f 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.14.0-rc2"
+VERSION="1.14.0"
 IMAGE="docker/compose:$VERSION"