From 94eebbaa880fcd983ed6556a40e0fde419185d24 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Thu, 20 Aug 2015 19:15:07 +0200
Subject: [PATCH 1/3] travis: add go1.5

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 82bc079f0..73db97905 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ sudo: false
 go:
   - 1.3.3
   - 1.4.2
+  - 1.5
 
 os:
   - linux

From 9f7346354b99dbcbf305b243f9eb112457e66fa1 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Thu, 20 Aug 2015 19:42:40 +0200
Subject: [PATCH 2/3] CI: only run gox -build-toolchain for Go < 1.5

---
 run_integration_tests.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/run_integration_tests.go b/run_integration_tests.go
index d9a4a6cd7..1e0d26d2d 100644
--- a/run_integration_tests.go
+++ b/run_integration_tests.go
@@ -47,9 +47,12 @@ func (env *TravisEnvironment) Prepare() {
 	}
 
 	msg("gox: OS %v, ARCH %v\n", env.goxOS, env.goxArch)
-	run("gox", "-build-toolchain",
-		"-os", strings.Join(env.goxOS, " "),
-		"-arch", strings.Join(env.goxArch, " "))
+
+	if !strings.HasPrefix(runtime.Version(), "go1.5") {
+		run("gox", "-build-toolchain",
+			"-os", strings.Join(env.goxOS, " "),
+			"-arch", strings.Join(env.goxArch, " "))
+	}
 }
 
 func (env *TravisEnvironment) RunTests() {

From fd2365724ebb7f7a7c613432316fc0b77bd8f8c3 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Thu, 20 Aug 2015 19:45:04 +0200
Subject: [PATCH 3/3] Remove unneded variables

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 73db97905..0b3c191cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,6 @@ os:
   - linux
   - osx
 
-env: GOX_OS="linux darwin openbsd freebsd windows" GOX_ARCH="386 amd64 arm"
-
 notifications:
   irc:
     channels: