Kubernetes Submit Queue c8004a1b7b Merge pull request #34908 from jansel/flannel_other_net_config ...

Automatic merge from submit-queue

Don't overwrite FLANNEL_OTHER_NET_CONFIG in ubuntu config

Make it easier to pass options to flannel through environment variables.

2016-10-19 01:03:49 -07:00

..

master

fixed typos, the path is not docker

2016-08-11 18:30:24 +08:00

master-flannel

fixed typos, the path is not docker

2016-08-11 18:30:24 +08:00

minion

fixed typos, the path is not docker

2016-08-11 18:30:24 +08:00

minion-flannel

fixed typos, the path is not docker

2016-08-11 18:30:24 +08:00

.gitignore

upgrade k8s to 1.0.1

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

config-default.sh

Merge pull request #34908 from jansel/flannel_other_net_config

2016-10-19 01:03:49 -07:00

config-test.sh

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

deployAddons.sh

move kube-dns to the cluster/addons/ directory

2016-07-14 11:44:00 -07:00

download-release.sh

Merge pull request #32667 from wingedfox/master

2016-10-15 02:12:58 -07:00

namespace.yaml

deprecate outdated param

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

reconfDocker.sh

Added option to specify the flannel backend, to cluster/ubuntu

2016-10-15 00:40:22 -04:00

util.sh

Added option to specify the flannel backend, to cluster/ubuntu

2016-10-15 00:40:22 -04:00