diff options
| author | Joffrey F <joffrey@docker.com> | 2017-06-15 17:05:23 -0700 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2017-06-19 13:28:04 -0700 |
| commit | cffce0880befc1426348eeb8a734b8baa8f790c5 (patch) | |
| tree | a788650232a1fc87a6a83bbef988e2a855a8fdb4 | |
| parent | abac2eea37d55bfef8ca443f3f79ccbdb0949db3 (diff) | |
Bump 1.14.0
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | compose/__init__.py | 2 | ||||
| -rwxr-xr-x | script/run/run.sh | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 02e439e4..cced3804 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Change log ========== -1.14.0 (2017-06-06) +1.14.0 (2017-06-19) ------------------- ### New features @@ -41,6 +41,9 @@ Change log - Fixed a bug where `cache_from` in the build section would be ignored when using more than one Compose file. +- Fixed a bug that prevented binding the same port to different IPs when + using more than one Compose file. + - Fixed a bug where override files would not be picked up by Compose if they had the `.yaml` extension diff --git a/compose/__init__.py b/compose/__init__.py index 9bbae98d..f6ed1f46 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.14.0-rc2' +__version__ = '1.14.0' diff --git a/script/run/run.sh b/script/run/run.sh index ef2f63d8..e4a2f419 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.14.0-rc2" +VERSION="1.14.0" IMAGE="docker/compose:$VERSION" |