Commit Graph

9 Commits (774832039cc4f05255bf239a3afc435076aa6ec5)

Author SHA1 Message Date
Tim Hockin a0f19518ef Merge pull request #326 from jainvipin/master
add contiv to networking.md
2016-05-22 20:30:16 -07:00
Anita Buehrle 84fe5ae069 Update Weave Net information from Weaveworks
Please move the Weave section above Flannel and include the following text: 

### Weave Net from Weaveworks

[Weave Net](https://www.weave.works/documentation/net-1-5-0-introducing-weave/) is a 
resilient and simple to use network for Kubernetes and its hosted applications.  
Weave Net runs as a [CNI plug-in](https://www.weave.works/documentation/net-1-5-0-cni-plugin/) 
or stand-alone.  In either version, it doesn’t require any configuration or extra code to run, 
and in both cases, the network provides one IP address per pod - as is standard for Kubernetes.
2016-04-21 15:24:15 -05:00
chrismarino 8ef536bcac Typo in url 2016-04-13 13:58:11 -07:00
Vipin Jain 37b89f0bd1 add contiv to networking.md 2016-04-05 22:30:44 -07:00
johndmulhausen 5c962aa68b Merge pull request #121 from chrismarino/master
Added Romana to the list of networking alternatives.
2016-03-16 17:36:02 -07:00
johndmulhausen c8dd8b8831 Import from Container Engine docs, addition of Tabs functionality, various link fixes 2016-03-16 15:54:34 -07:00
chrismarino 85034e8090 Added Romana to the list of networking alternatives. 2016-03-14 11:28:30 -07:00
John Mulhausen 97c728d343 1.2 changes for admin/ 2016-03-06 04:26:30 -08:00
John Mulhausen 4c9e72c518 Moving docs from /vX to /docs; we will use branches for old versions. 2016-02-29 15:17:22 -08:00