Bump 1.12.0-rc2

Signed-off-by: Joffrey F <joffrey@docker.com>
docker · Mar 24, 2017 · 08dc2a4 · 08dc2a4
1 parent 7575f40
commit 08dc2a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -92,6 +92,9 @@ Change log
 - Fixed a bug where `docker-compose` would crash when trying to write into
   a closed pipe
 
+- Fixed an issue where Compose would not pick up on the value of
+  COMPOSE_TLS_VERSION when used in combination with command-line TLS flags
+
 1.11.2 (2017-02-17)
 -------------------
 

diff --git a/compose/__init__.py b/compose/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.12.0-rc1'
+__version__ = '1.12.0-rc2'
diff --git a/script/run/run.sh b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.12.0-rc1"
+VERSION="1.12.0-rc2"
 IMAGE="docker/compose:$VERSION"
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
     set -e
-    VERSION="1.12.0-rc1"
+    VERSION="1.12.0-rc2"
     IMAGE="docker/compose:$VERSION"
@@ Expand Down @@