From 7805960a73cbcc58eec49cfbf86fdc66045a57fd Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Fri, 18 Aug 2017 15:37:14 -0700
Subject: [PATCH] Bump 1.16.0-rc1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 928922782..0790f6184 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,66 @@
 Change log
 ==========
 
+1.16.0 (2017-08-31)
+-------------------
+
+### New features
+
+#### Compose file version 3.4
+
+- Introduced version 3.4 of the `docker-compose.yml` specification.
+  This version requires to be used with Docker Engine 17.06.0 or above.
+
+#### Compose file version 2.3
+
+- Introduced version 2.3 of the `docker-compose.yml` specification.
+  This version requires to be used with Docker Engine 17.06.0 or above.
+
+- Added support for the `target` parameter in network configurations
+  (also available in 3.4)
+
+- Added support for the `start_period` parameter in healthcheck
+  configurations
+
+#### Compose file version 2.x
+
+- Added support for the `blkio_config` parameter in service definitions
+
+- Added support for setting a custom name in volume definitions using
+  the `name` parameter (not available for version 2.0)
+
+#### All formats
+
+- Added new CLI flag `--no-ansi` to suppress ANSI control characters in
+  output
+
+### Bugfixes
+
+- Fixed a bug where nested `extends` instructions weren't resolved
+  properly, causing "file not found" errors
+
+- Fixed several issues with `.dockerignore` parsing
+
+- Fixed issues where logs of TTY-enabled services were being printed
+  incorrectly and causing `MemoryError` exceptions
+
+- The `$` character in the output of `docker-compose config` is now
+  properly escaped
+
+- Fixed a bug where running `docker-compose top` would sometimes fail
+  with an uncaught exception
+
+- Fixed a bug where `docker-compose pull` with the `--parallel` flag
+  would return a `0` exit code when failing
+
+- Fixed an issue where keys in `deploy.resources` were not being validated
+
+- Fixed an issue where the `logging` options in the output of
+  `docker-compose config` would be set to `null`, an invalid value
+
+- Fixed the output of `docker-compose config` when a port definition used
+  `0` as the value for the published port
+
 1.15.0 (2017-07-26)
 -------------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index cedb7cf04..b090ccfa2 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.16.0-dev'
+__version__ = '1.16.0-rc1'
diff --git a/script/run/run.sh b/script/run/run.sh
index 47a81c7f8..bf9a26cb8 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.15.0"
+VERSION="1.16.0"
 IMAGE="docker/compose:$VERSION"