k8s-merge-robot 46b1a0a24d Merge pull request #27246 from ZJU-SEL/ubuntu-kube-up ...

Automatic merge from submit-queue

[ubuntu]honor original docker_opts

2016-06-27 23:48:49 -07:00

..

master

Support a CNI plugin as an alternative to Flannel

2016-02-22 11:29:55 -05:00

master-flannel

Support a CNI plugin as an alternative to Flannel

2016-02-22 11:29:55 -05:00

minion

Support a CNI plugin as an alternative to Flannel

2016-02-22 11:29:55 -05:00

minion-flannel

Support a CNI plugin as an alternative to Flannel

2016-02-22 11:29:55 -05:00

.gitignore

upgrade k8s to 1.0.1

2015-07-24 13:31:52 +08:00

config-default.sh

[fix] allow ALLOW_PRIVILEGED to be passed to kubelet and kube-api, needed for running docker in docker

2016-05-31 19:06:48 -04:00

config-test.sh

Add newline to the end of bash scripts

2015-09-18 19:35:05 +03:00

deployAddons.sh

Fixed deployAddons.sh to use sed template for skydns-svc.yaml

2016-06-24 22:21:35 -04:00

download-release.sh

Automatically download the latest stable release version of

2016-05-16 13:52:10 -07:00

namespace.yaml

deprecate outdated param

2015-07-29 13:57:14 +08:00

reconfDocker.sh

honor original docker_opts

2016-06-12 10:29:41 +08:00

util.sh

Fixed typos - privileged not priviliged

2016-06-25 16:06:33 -04:00