From 880b0a883a4b134142a624f8a59f50d0802908ad Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Wed, 26 Oct 2016 11:07:14 +0100
Subject: [PATCH] Use vendoring when building test runner

---
 Makefile          | 2 +-
 vagrant-common.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 69e0dc59..fe19f732 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ tools/.git:
 	git submodule update --init
 
 $(RUNNER_EXE): tools/.git
-	make -C tools/runner
+	GO15VENDOREXPERIMENT=1 make -C tools/runner
 
 $(PUBLISH): publish_%: $(IMAGES_UPTODATE)
 	$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker tag  $(DOCKERHUB_USER)/$* $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION)
diff --git a/vagrant-common.rb b/vagrant-common.rb
index d54127fb..704d024e 100644
--- a/vagrant-common.rb
+++ b/vagrant-common.rb
@@ -1,4 +1,4 @@
-$go_version = "1.4.2"
+$go_version = "1.5.2"
 
 $go_path = "/usr/local/go/bin"