From 12a361c3bc537c1d464d0d65b064204c27bf50e6 Mon Sep 17 00:00:00 2001
From: David Gageot <david@gageot.net>
Date: Wed, 23 Dec 2015 15:49:33 +0100
Subject: [PATCH] FIX #2670 Upgrade to go 1.5.2

Signed-off-by: David Gageot <david@gageot.net>
---
 CONTRIBUTING.md    | 4 ++--
 Dockerfile         | 2 +-
 Godeps/Godeps.json | 2 +-
 circle.yml         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index efd3736387..631350fb58 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md).
 
 The requirements to build Machine are:
 
-1.  A running instance of Docker or a Golang 1.5 development environment
+1.  A running instance of Docker or a Golang 1.5.2 development environment
 2.  The `bash` shell
 3.  [Make](https://www.gnu.org/software/make/)
 
@@ -29,7 +29,7 @@ To build the `docker-machine` binary using containers, simply run:
     $ export USE_CONTAINER=true
     $ make build
 
-## Local Go 1.5 development environment
+## Local Go development environment
 
 Make sure the source code directory is under a correct directory structure to use Go 1.5 vendoring;
 example of cloning and preparing the correct environment `GOPATH`:
diff --git a/Dockerfile b/Dockerfile
index 51c90d4818..6d4ff3576f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.5.1
+FROM golang:1.5.2
 
 RUN go get  github.com/golang/lint/golint \
             github.com/mattn/goveralls \
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 7c1f619614..fcafa8474f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/docker/machine",
-	"GoVersion": "go1.5.1",
+	"GoVersion": "go1.5.2",
 	"Packages": [
 		"github.com/docker/machine",
 		"github.com/docker/machine/cmd",
diff --git a/circle.yml b/circle.yml
index 03e32e062c..3d8f45b8a1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,7 +8,7 @@ machine:
     # - sudo apt-get install -y virtualbox
 
   post:
-    - gvm install go1.5.1 -B --name=stable
+    - gvm install go1.5.2 -B --name=stable
 
   environment:
   # Convenient shortcuts to "common" locations