From fb241d0906cd667fec0a36449883d905a00992a1 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 9 Jan 2017 16:39:37 -0800
Subject: [PATCH] Bump 1.10.0-rc2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3653a4343..f14bc99e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,8 +12,6 @@ Change log
   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
@@ -30,6 +28,10 @@ Change log
 
 - Compose now adds identifying labels to networks and volumes it creates
 
+#### Compose file version 2.0 and up
+
+- Added support for the `stop_grace_period` option in service definitions.
+
 ### Bugfixes
 
 - Colored output now works properly on Windows.
@@ -40,6 +42,12 @@ Change log
 - Networks created by Compose are now always made attachable
   (Compose files v2.1 and up).
 
+- Fixed a bug where falsy values of `COMPOSE_CONVERT_WINDOWS_PATHS`
+  (`0`, `false`, empty value) were being interpreted as true.
+
+- Fixed a bug where forward slashes in some .dockerignore patterns weren't
+  being parsed correctly on Windows
+
 
 1.9.0 (2016-11-16)
 -----------------
diff --git a/compose/__init__.py b/compose/__init__.py
index f1bad0e1a..476033b2a 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.0-rc1'
+__version__ = '1.10.0-rc2'
diff --git a/script/run/run.sh b/script/run/run.sh
index 5354b5f0d..51385a575 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.10.0-rc1"
+VERSION="1.10.0-rc2"
 IMAGE="docker/compose:$VERSION"