Kubernetes Submit Queue 71b558835b Merge pull request #32667 from wingedfox/master ...

Automatic merge from submit-queue

Fixed downloading of flannel 0.6.x releases in ubuntu installer, 0.5.x works as well

**What this PR does / why we need it**:
This PR fixes compatibility of ubuntu installer with flannel release 0.6.0 and 0.6.1 where download url was changed.

**Release note**:
```NONE
```

2016-10-15 02:12:58 -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

Fix typo: incremeting -> incrementing

2016-09-24 16:10:51 -04: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

fix the appending bug

2016-09-21 16:36:08 +08:00

util.sh

Merge pull request #31206 from GregoryIan/patch-1

2016-10-13 23:51:06 -07:00