Merge pull request #1188 from vieux/switch_to_1.5

switch to golang 1.5

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.4
+  - 1.5
 
 # let us have speedy Docker-based Travis workers
 sudo: false

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.4
+FROM golang:1.5
 
 COPY . /go/src/github.com/docker/swarm
 WORKDIR /go/src/github.com/docker/swarm

test/integration/Dockerfile

@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install golang
-ENV GO_VERSION 1.4.2
+ENV GO_VERSION 1.5
 RUN curl -sSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/local -xz \
     && mkdir -p /go/bin
 ENV PATH /go/bin:/usr/local/go/bin:$PATH