From be6b811c4e9a1e8f22f2216c128b9bc91f4ebfdd Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 29 Oct 2015 12:51:57 -0400
Subject: [PATCH] Bump 1.5.0rc3

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 CHANGELOG.md        | 20 +++++++++++++++++---
 compose/__init__.py |  2 +-
 docs/install.md     |  4 ++--
 script/run.sh       |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b2ecd97e..b0474ae2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,33 @@
 Change log
 ==========
 
-1.5.0 (2015-10-13)
+1.5.0 (2015-11-02)
 ------------------
 
+**Breaking changes:**
+
+With the introduction of variable substitution support in the Compose file, any
+Compose file that uses an environment variable (`$VAR` or `${VAR}`) in the `command:`
+or `entrypoint:` field will break.
+
+Previously these values were interpolated inside the container, with a value
+from the container environment.  In Compose 1.5.0, the values will be
+interpolated on the host, with a value from the host environment.
+
+To migrate a Compose file to 1.5.0, escape the variables with an extra `$`
+(ex: `$$VAR` or `$${VAR}`).  See
+https://github.com/docker/compose/blob/8cc8e61/docs/compose-file.md#variable-substitution
+
 Major features:
 
 -   Compose is now available for Windows.
 
 -   Environment variables can be used in the Compose file. See
-    https://github.com/docker/compose/blob/129092b7/docs/yml.md#variable-substitution
+    https://github.com/docker/compose/blob/8cc8e61/docs/compose-file.md#variable-substitution
 
 -   Multiple compose files can be specified, allowing you to override
     settings in the default Compose file. See
-    https://github.com/docker/compose/blob/129092b7/docs/reference/docker-compose.md
+    https://github.com/docker/compose/blob/8cc8e61/docs/reference/docker-compose.md
     for more details.
 
 -   Compose now produces better error messages when a file contains
diff --git a/compose/__init__.py b/compose/__init__.py
index 8ea59a363..7199babb4 100644
--- a/compose/__init__.py
+++ b/compose/__init__.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '1.5.0rc2'
+__version__ = '1.5.0rc3'
diff --git a/docs/install.md b/docs/install.md
index ea78948ed..711902c7f 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.5.0rc2
+        docker-compose version: 1.5.0rc3
 
 
 ## Alternative install options
@@ -76,7 +76,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.5.0rc2/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.5.0rc3/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds
diff --git a/script/run.sh b/script/run.sh
index 25fc8c077..9ed1ea74c 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.5.0rc2"
+VERSION="1.5.0rc3"
 IMAGE="docker/compose:$VERSION"