From 8dd22a962a4295ada9c8a45a5c58d02f8f66333f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 13 Dec 2017 13:40:42 -0800
Subject: [PATCH] Bump 1.18.0

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 CHANGELOG.md        | 19 ++++++++++---------
 compose/__init__.py |  2 +-
 script/run/run.sh   |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac2050512..c0b3b5653 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ Change log
 #### Compose file version 3.5
 
 - Introduced version 3.5 of the `docker-compose.yml` specification.
-  This version requires to be used with Docker Engine 17.06.0 or above
+  This version requires Docker Engine 17.06.0 or above
 
 - Added support for the `shm_size` parameter in build configurations
 
@@ -21,20 +21,15 @@ Change log
 
 - Added support for `extra_hosts` in build configuration
 
-- Added support for the
-  [long syntax](https://docs.docker.com/compose/compose-file/#long-syntax-3)
-  for volume entries, as previously introduced in the 3.2 format.
-  Note that using this syntax will create
-  [mounts](https://docs.docker.com/engine/admin/volumes/bind-mounts/)
-  instead of volumes.
+- Added support for the [long syntax](https://docs.docker.com/compose/compose-file/#long-syntax-3) for volume entries, as previously introduced in the 3.2 format.
+  Note that using this syntax will create [mounts](https://docs.docker.com/engine/admin/volumes/bind-mounts/) instead of volumes.
 
 #### Compose file version 2.1 and up
 
 - Added support for the `oom_kill_disable` parameter in service definitions
   (2.x only)
 
-- Added support for custom names for network, secret and config definitions
-  (2.x only)
+- Added support for custom names for network definitions (2.x only)
 
 
 #### All formats
@@ -62,6 +57,12 @@ Change log
 - Fixed an issue with CLI logging causing duplicate messages and inelegant
   output to occur
 
+- Fixed an issue that caused `stop_grace_period` to be ignored when using
+  multiple Compose files
+
+- Fixed a bug that caused `docker-compose images` to crash when using
+  untagged images
+
 - Fixed a bug where the valid `${VAR:-}` syntax would cause Compose to
   error out
 
diff --git a/compose/__init__.py b/compose/__init__.py
index 231670a5c..a15ad45f3 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-rc2'
+__version__ = '1.18.0'
diff --git a/script/run/run.sh b/script/run/run.sh
index 4be14b722..abb4ff4fe 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.18.0-rc2"
+VERSION="1.18.0"
 IMAGE="docker/compose:$VERSION"