diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-11 05:39:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 05:39:12 -0800 |
| commit | b3eb23d671425775673f86bd02b9c89ef781f590 (patch) | |
| tree | 5f06e4e289f16d9164d692590a3fe6541b5384cf /vendor/github.com/containernetworking/plugins/README.md | |
| parent | 26f2b7debde313af4a5ae39727c66a3f8fd59be4 (diff) | |
| parent | bd40dcfc2bc7c9014ea1f33482fb63aacbcdfe87 (diff) | |
| download | podman-b3eb23d671425775673f86bd02b9c89ef781f590.tar.gz podman-b3eb23d671425775673f86bd02b9c89ef781f590.tar.bz2 podman-b3eb23d671425775673f86bd02b9c89ef781f590.zip | |
Merge pull request #2102 from vrothberg/vendor-update
vendor: update everything
Diffstat (limited to 'vendor/github.com/containernetworking/plugins/README.md')
| -rw-r--r-- | vendor/github.com/containernetworking/plugins/README.md | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vendor/github.com/containernetworking/plugins/README.md b/vendor/github.com/containernetworking/plugins/README.md index 864601763..f0e444355 100644 --- a/vendor/github.com/containernetworking/plugins/README.md +++ b/vendor/github.com/containernetworking/plugins/README.md @@ -4,14 +4,12 @@ # plugins Some CNI network plugins, maintained by the containernetworking team. For more information, see the individual READMEs. -Read [CONTRIBUTING](CONTRIBUTING.md) for build and test instructions. - ## Plugins supplied: ### Main: interface-creating * `bridge`: Creates a bridge, adds the host and the container to it. -* `ipvlan`: Adds an [ipvlan](https://www.kernel.org/doc/Documentation/networking/ipvlan.txt) interface in the container. -* `loopback`: Set the state of loopback interface to up. -* `macvlan`: Creates a new MAC address, forwards all traffic to that to the container. +* `ipvlan`: Adds an [ipvlan](https://www.kernel.org/doc/Documentation/networking/ipvlan.txt) interface in the container +* `loopback`: Creates a loopback interface +* `macvlan`: Creates a new MAC address, forwards all traffic to that to the container * `ptp`: Creates a veth pair. * `vlan`: Allocates a vlan device. |