Merge pull request #25051 from spxtr/fix-1.6.2

Automatic merge from submit-queue Use v1.6.2-1 tag for build. Is there any reason these don't use the VERSION file like everything else? cc @luxas @ixdy

Merge pull request #25051 from spxtr/fix-1.6.2
c79c5864 · k8s-merge-robot · 0e2ecb7a · f128b303 · c79c5864 · c79c5864
Commit c79c5864 authored May 05, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

common.sh build/common.sh +1 -1

Makefile cluster/images/flannel/Makefile +1 -1

No files found.
--- a/build/common.sh
+++ b/build/common.sh
@@ -48,7 +48,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"

 # Constants
 readonly KUBE_BUILD_IMAGE_REPO=kube-build
-readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.0-2"
+readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.2-1"
 # KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>"

 # Here we map the output directories across both the local and remote _output

--- a/cluster/images/flannel/Makefile
+++ b/cluster/images/flannel/Makefile
@@ -20,7 +20,7 @@
 TAG?=0.5.5
 ARCH?=amd64
 REGISTRY?=gcr.io/google_containers
-KUBE_CROSS_TAG=v1.6.0-2
+KUBE_CROSS_TAG=v1.6.2-1
 GOARM=6
 TEMP_DIR:=$(shell mktemp -d)
 BASEIMAGE?=gcr.io/google_containers/debian-iptables-${ARCH}:v2