From dfed245b57e9430994741ab05558627e6827d7fa Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 16 Feb 2017 17:14:34 -0800
Subject: [PATCH] Bump 1.11.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9f466b3..14197cc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,27 @@
 Change log
 ==========
 
+1.11.2 (2017-02-17)
+-------------------
+
+### Bugfixes
+
+- Fixed a bug that was preventing secrets configuration from being
+  loaded properly
+
+- Fixed a bug where the `docker-compose config` command would fail
+  if the config file contained secrets definitions
+
+- Fixed an issue where Compose on some linux distributions would
+  pick up and load an outdated version of the requests library
+
+- Fixed an issue where socket-type files inside a build folder
+  would cause `docker-compose` to crash when trying to build that
+  service
+
+- Fixed an issue where recursive wildcard patterns `**` were not being
+  recognized in `.dockerignore` files.
+
 1.11.1 (2017-02-09)
 -------------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index 8caa1fd2..a6647198 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.11.1'
+__version__ = '1.11.2'
diff --git a/script/run/run.sh b/script/run/run.sh
index 77ee0a01..f5d9ae86 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.11.1"
+VERSION="1.11.2"
 IMAGE="docker/compose:$VERSION"