Merge branch '1.5'

This commit is contained in:
Matthias Radestock committed 2016-04-26 14:08:21 +01:00
commit 6ac248bfbf
1 file changed
+2 -2
+2 -2
View File
@@ -9,6 +9,6 @@ to integrate Weave Net with [Kubernetes](http://kubernetes.io/).
The Docker plugin runs automatically when you `weave launch`, provided your
Docker daemon is version 1.9 or newer.
More detail on the Docker plugin [here](http://docs.weave.works/weave/latest_release/plugin.html).
More detail on the Docker plugin [here](https://github.com/weaveworks/weave/blob/master/site/plugin.md).
More detail on the CNI plugin [here](https://github.com/weaveworks/weave/blob/master/site/plugin/cni-plugin-how-to.md).
More detail on the CNI plugin [here](https://github.com/weaveworks/weave/blob/master/site/cni-plugin.md).