Merge pull request #2113 from priyawadhwa/upgrade-go

upgrade to go 1.9
kubernetes · Oct 24, 2017 · 4d10509 · 4d10509
2 parents 15f2620 + 404a043
commit 4d10509
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ os: linux
 sudo: required
 
 go:
-  - 1.8.3
+  - 1.9
 go_import_path: k8s.io/minikube
 
 install:

diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ BUILDROOT_BRANCH ?= 2017.02
 REGISTRY?=gcr.io/k8s-minikube
 
 HYPERKIT_BUILD_IMAGE 	?= karalabe/xgo-1.8.3
-BUILD_IMAGE 	?= gcr.io/google_containers/kube-cross:v1.8.3-1
+BUILD_IMAGE 	?= gcr.io/google_containers/kube-cross:v1.9.1-1
 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
 
 ISO_VERSION ?= v0.23.6
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ os: linux @@
     sudo: required
     go:
-      - 1.8.3
+      - 1.9
     go_import_path: k8s.io/minikube
     install:
@@ Expand Down @@