From ecff6f1a9a6f56eeaff378da814dafde9dd53b02 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 4 Jan 2017 13:47:13 -0800
Subject: [PATCH] Bump 1.10.0-rc1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9780df98a..3653a4343 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,46 @@
 Change log
 ==========
 
+1.10.0 (2017-01-18)
+-------------------
+
+### New Features
+
+#### Compose file version 3.0
+
+- Introduced version 3.0 of the `docker-compose.yml` specification. This
+  version requires to be used with Docker Engine 1.13 or above and is
+  specifically designed to work with the `docker stack` commands.
+
+  - Added support for the `stop_grace_period` option in service definitions.
+
+#### Compose file version 2.1 and up
+
+- Healthcheck configuration can now be done in the service definition using
+  the `healthcheck` parameter
+
+- Containers dependencies can now be set up to wait on positive healthchecks
+  when declared using `depends_on`. See the documentation for the updated
+  syntax.
+  **Note:** This feature will not be ported to version 3 Compose files.
+
+- Added support for the `sysctls` parameter in service definitions
+
+- Added support for the `userns_mode` parameter in service definitions
+
+- Compose now adds identifying labels to networks and volumes it creates
+
+### Bugfixes
+
+- Colored output now works properly on Windows.
+
+- Fixed a bug where docker-compose run would fail to set up link aliases
+  in interactive mode on Windows.
+
+- Networks created by Compose are now always made attachable
+  (Compose files v2.1 and up).
+
+
 1.9.0 (2016-11-16)
 -----------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index 6f05b282f..f1bad0e1a 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.10.0dev'
+__version__ = '1.10.0-rc1'
diff --git a/script/run/run.sh b/script/run/run.sh
index 5872b081a..5354b5f0d 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.8.0"
+VERSION="1.10.0-rc1"
 IMAGE="docker/compose:$VERSION"