From e115eaf6fc3682a0bae0b5148f0793346950e9da Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 27 Jul 2016 18:26:40 +0100
Subject: [PATCH 1/2] Fix error message for unrecognised TLS version

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/cli/command.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compose/cli/command.py b/compose/cli/command.py
index 09a9ced8..2c70d31a 100644
--- a/compose/cli/command.py
+++ b/compose/cli/command.py
@@ -65,8 +65,9 @@ def get_tls_version(environment):
     tls_attr_name = "PROTOCOL_{}".format(compose_tls_version)
     if not hasattr(ssl, tls_attr_name):
         log.warn(
-            'The {} protocol is unavailable. You may need to update your '
+            'The "{}" protocol is unavailable. You may need to update your '
             'version of Python or OpenSSL. Falling back to TLSv1 (default).'
+            .format(compose_tls_version)
         )
         return None
 

From f3628c7a5e14b545a8f3d93f5f03681d2e5de4ef Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 27 Jul 2016 11:55:49 -0700
Subject: [PATCH 2/2] Bump 1.8.0

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

diff --git a/compose/__init__.py b/compose/__init__.py
index f9f0e6a6..c550f990 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.8.0-rc3'
+__version__ = '1.8.0'
diff --git a/docs/install.md b/docs/install.md
index 2099b71c..bb7f07b3 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
 
      The following is an example command illustrating the format:
 
-        curl -L https://github.com/docker/compose/releases/download/1.8.0-rc3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+        curl -L https://github.com/docker/compose/releases/download/1.8.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 
      If you have problems installing with `curl`, see
      [Alternative Install Options](#alternative-install-options).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
 7. Test the installation.
 
         $ docker-compose --version
-        docker-compose version: 1.8.0-rc3
+        docker-compose version: 1.8.0
 
 
 ## Alternative install options
@@ -77,7 +77,7 @@ to get started.
 Compose can also be run inside a container, from a small bash script wrapper.
 To install compose as a container run:
 
-    $ curl -L https://github.com/docker/compose/releases/download/1.8.0-rc3/run.sh > /usr/local/bin/docker-compose
+    $ curl -L https://github.com/docker/compose/releases/download/1.8.0/run.sh > /usr/local/bin/docker-compose
     $ chmod +x /usr/local/bin/docker-compose
 
 ## Master builds
diff --git a/script/run/run.sh b/script/run/run.sh
index c2c01db6..6205747a 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.8.0-rc3"
+VERSION="1.8.0"
 IMAGE="docker/compose:$VERSION"