diff --git a/CHANGELOG.md b/CHANGELOG.md index 0aa3acf65..8d49ddea7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Change log ========== -1.12.0 (2017-03-21) +1.12.0 (2017-04-04) ------------------- ### New features @@ -74,6 +74,9 @@ Change log - Fixed a bug where override files containing port lists would cause a TypeError to be raised +- Fixed a bug where the `deploy` key would be missing from the output of + `docker-compose config` + - Fixed a bug where scaling services up or down would sometimes re-use obsolete containers diff --git a/compose/__init__.py b/compose/__init__.py index 4399b28af..bf126ebb7 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-rc2' +__version__ = '1.12.0' diff --git a/script/run/run.sh b/script/run/run.sh index 62c065bbc..9fd097d75 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.12.0-rc2" +VERSION="1.12.0" IMAGE="docker/compose:$VERSION"