github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-19 00:19:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24266 from spxtr/1.6.1

Browse Source 
Automatic merge from submit-queue

Up to go 1.6.2 for build and test.

~~1.6.1 contains some security fixes. 1.6.2 should be out soon.~~ 1.6.2 is out :D

Images aren't pushed yet.
This commit is contained in:
k8s-merge-robot
2016-05-02 05:23:16 -07:00
parent cbb0d32868 009ea19bf6
commit c6157a2356
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/Dockerfile
View File

@@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about.
FROM golang:1.6.0
FROM golang:1.6.2
ENV GOARM 6
ENV KUBE_DYNAMIC_CROSSPLATFORMS \

2
build/build-image/cross/VERSION
View File

@@ -1 +1 @@
v1.6.0-2
v1.6.2-1