Merge branch '1.8'

This commit is contained in:
Adam Harrison committed 2016-11-25 17:23:39 +00:00
commit 9cff5f2c5e
1 file changed
+2 -3
+2 -3
View File
@@ -23,9 +23,8 @@ network.
> alternatively if you are using the older cluster set-up scripts from
> the Kubernetes repo, you can use
>
> ```
> NETWORK_PROVIDER=cni cluster/kube-up.sh
> ```
>
> NETWORK_PROVIDER=cni cluster/kube-up.sh
NB If you were previously using the [Weave CNI
driver](/site/cni-plugin.md) from a full install of Weave Net with your