From 344a69331cb3842c6f2f9f18eef22dea10ca21a5 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 11 Jul 2017 19:07:12 -0700
Subject: [PATCH] Bump 1.15.0-rc1

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 CHANGELOG.md                   | 44 ++++++++++++++++++++++++++++++++++
 compose/__init__.py            |  2 +-
 script/run/run.sh              |  2 +-
 tests/integration/testcases.py |  5 ++--
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cced3804c..c4b97a756 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,50 @@
 Change log
 ==========
 
+1.15.0 (2017-07-18)
+-------------------
+
+### New features
+
+#### Compose file version 2.2
+
+- Added support for the `network` parameter in build configurations.
+
+#### Compose file version 2.1 and up
+
+- The `pid` option in a service's definition now supports a `service:<name>`
+  value.
+
+- Added support for the `storage_opt` parameter in in service definitions.
+  This option is not available for the v3 format
+
+#### All formats
+
+- Added `--quiet` flag to `docker-compose pull`, suppressing progress output
+
+- Some improvements to CLI output
+
+### Bugfixes
+
+- Volumes specified through the `--volume` flag of `docker-compose run` now
+  complement volumes declared in the service's defintion instead of replacing
+  them
+
+- Fixed a bug where using multiple Compose files would unset the scale value
+  defined inside the Compose file.
+
+- Fixed an issue where the `credHelpers` entries in the `config.json` file
+  were not being honored by Compose
+
+- Fixed a bug where using multiple Compose files with port declarations
+  would cause failures in Python 3 environments
+
+- Fixed a bug where some proxy-related options present in the user's
+  environment would prevent Compose from running
+
+- Fixed an issue where the output of `docker-compose config` would be invalid
+  if the original file used `Y` or `N` values
+
 1.14.0 (2017-06-19)
 -------------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index 1898479bf..c040b295f 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.15.0dev'
+__version__ = '1.15.0-rc1'
diff --git a/script/run/run.sh b/script/run/run.sh
index e4a2f4199..4f0f764b3 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.14.0"
+VERSION="1.15.0-rc1"
 IMAGE="docker/compose:$VERSION"
 
 
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index 7d600f323..fd30744b1 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -17,6 +17,7 @@ from compose.const import COMPOSEFILE_V2_0 as V2_0
 from compose.const import COMPOSEFILE_V2_0 as V2_1
 from compose.const import COMPOSEFILE_V2_2 as V2_2
 from compose.const import COMPOSEFILE_V3_0 as V3_0
+from compose.const import COMPOSEFILE_V3_2 as V3_2
 from compose.const import COMPOSEFILE_V3_3 as V3_3
 from compose.const import LABEL_PROJECT
 from compose.progress_stream import stream_output
@@ -52,7 +53,7 @@ def engine_max_version():
     if version_lt(version, '1.13'):
         return V2_1
     if version_lt(version, '17.06'):
-        return V2_2
+        return V3_2
     return V3_3
 
 
@@ -72,7 +73,7 @@ def v2_1_only():
 
 
 def v2_2_only():
-    return min_version_skip(V2_0)
+    return min_version_skip(V2_2)
 
 
 def v3_only():