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

Merge pull request #22149 from luxas/onedotsix

Browse Source 
Automatic merge from submit-queue

Up to golang 1.6

A second attempt to upgrade go version above `go1.4`
Merge ASAP after you've cut the `release-1.2` branch and feel ready.
`go1.6` should perform slightly better than `go1.5`, so this time it might work
@gmarek @wojtek-t @zmerlynn @mikedanese @brendandburns @ixdy @thockin
This commit is contained in:
k8s-merge-robot
2016-04-05 13:26:18 -07:00
parent 9a7860855c 2928d0a8ec
commit 4f329516ae
8 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/mesos/docker/test/Dockerfile
View File

@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM golang:1.4.3
FROM golang:1.6.0
MAINTAINER Mesosphere <support@mesosphere.io>
# docker.io is suppossed to be in backports, but it's not there yet.