diff --git a/CHANGELOG.md b/CHANGELOG.md index 581d45bbf..0aa3acf65 100644 --- 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 index 502e9cc4f..4399b28af 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.12.0-rc1' +__version__ = '1.12.0-rc2' diff --git a/script/run/run.sh b/script/run/run.sh index 192b31219..62c065bbc 100755 --- 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"