k8s-merge-robot 1ad3e11a59 Merge pull request #26582 from adityakali/ark.docker1.11 ...

Automatic merge from submit-queue

pin GCI version to milestone 52

This is mainly for pinning the 1.2 branch to GCI milestone 52
which contains correct docker and kubelet built in.
Doing this allows us to upgrade docker to v1.11 (issue #26455)
in GCI 53 without breaking the 1.2 release branch.

@kubernetes/goog-image @dchen1107 @roberthbailey @andyzheng0831

2016-06-03 02:05:30 -07:00

..

coreos

removed --metric_resolution=60s per piosz

2016-06-01 12:00:35 -07:00

debian

Make bigger master root disks in GCE for large clusters

2016-05-16 15:57:56 +02:00

gci

Added logging to file for cluster autoscaler

2016-06-02 13:51:40 +02:00

trusty

Trusty: fix 'find' commands and add k8s license and motd info

2016-06-02 14:35:44 -07:00

config-common.sh

kube-up for GCE chooses master size based on number of nodes

2016-03-02 12:27:54 +01:00

config-default.sh

Move the defaults setting of GCI to util.sh

2016-06-01 15:37:02 -07:00

config-test.sh

Move the defaults setting of GCI to util.sh

2016-06-01 15:37:02 -07:00

configure-vm.sh

Merge pull request #26156 from gmarek/base64

2016-05-29 09:45:49 -07:00

delete-stranded-load-balancers.sh

Replace awkward bash pipelines with gcloud's --format='value()'

2016-05-06 15:49:57 -07:00

list-resources.sh

Fix list-resources grep

2016-04-08 12:19:24 -07:00

upgrade.sh

Move KUBERNETES_PROVIDER setting into cluster/kube-util.sh.

2016-03-08 16:51:20 -08:00

util.sh

pin GCI version to milestone 52

2016-06-02 13:52:38 -07:00