From 1719ceb881890f84d97df7eaa2d000b205879cc8 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 1 May 2017 14:38:12 -0700
Subject: [PATCH] Bump 1.13.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8f64d75755..d1da62e3486 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Change log
 ==========
 
-1.13.0 (2017-05-01)
+1.13.0 (2017-05-02)
 -------------------
 
 ### Breaking changes
@@ -47,6 +47,15 @@ Change log
 - Fixed an issue where paths containing unicode characters passed via the `-f`
   flag were causing Compose to crash
 
+- Fixed an issue where the output of `docker-compose config` would be invalid
+  if the Compose file contained external secrets
+
+- Fixed a bug where using `--exit-code-from` with `up` would fail if Compose
+  was installed in a Python 3 environment
+
+- Fixed a bug where recreating containers using a combination of `tmpfs` and
+  `volumes` would result in an invalid config state
+
 
 1.12.0 (2017-04-04)
 -------------------
diff --git a/compose/__init__.py b/compose/__init__.py
index f80467115b3..1f4c85725ed 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.13.0-rc1'
+__version__ = '1.13.0'
diff --git a/script/run/run.sh b/script/run/run.sh
index beff0c6b92f..e697d1f6dca 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.13.0-rc1"
+VERSION="1.13.0"
 IMAGE="docker/compose:$VERSION"