Merge pull request #18456 from thockin/bump-flannel-ver

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-11 00:34:39 -08:00
7 changed files with 8 additions and 7 deletions

View File

@@ -256,6 +256,7 @@ EOF
function create-flanneld-opts() {
cat <<EOF > ~/kube/default/flanneld
FLANNEL_OPTS="--etcd-endpoints=http://${1}:4001 \
--ip-masq \
--iface=${2}"
EOF
}