summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2017-12-08 14:29:43 -0800
committerJoffrey F <joffrey@docker.com>2017-12-08 14:30:44 -0800
commit189468b07f295c8df8997e770701be31159ef54e (patch)
tree07f3c3b0e8391afce181cd4620a3f62d15906908
parent45d2eb40039da06279683e113393d8e286189e3d (diff)
Bump 1.18.0-rc2
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--CHANGELOG.md2
-rw-r--r--compose/__init__.py2
-rwxr-xr-xscript/run/run.sh2
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74d4f93f..ac205051 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,8 @@ Change log
- Fixed a bug where missing secret files would generate an empty directory
in their place
+- Fixed character encoding issues in the CLI's error handlers
+
- Added validation for the `test` field in healthchecks
- Added validation for the `subnet` field in IPAM configurations
diff --git a/compose/__init__.py b/compose/__init__.py
index 2b363f3b..231670a5 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.18.0-rc1'
+__version__ = '1.18.0-rc2'
diff --git a/script/run/run.sh b/script/run/run.sh
index 441c0d80..4be14b72 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
set -e
-VERSION="1.18.0-rc1"
+VERSION="1.18.0-rc2"
IMAGE="docker/compose:$VERSION"