diff options
author | Matthew Heon <matthew.heon@gmail.com> | 2018-07-26 13:37:01 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-27 02:48:15 +0000 |
commit | 54967d7a10d70fb90c0e163ff78c15036518f2d2 (patch) | |
tree | 933cbcf1142c7af9c7b7be15644f983348c536b3 /vendor/github.com/containernetworking/plugins/README.md | |
parent | f9152d075a3175ad62f77b3166c3cb0df2c310f2 (diff) | |
download | podman-54967d7a10d70fb90c0e163ff78c15036518f2d2.tar.gz podman-54967d7a10d70fb90c0e163ff78c15036518f2d2.tar.bz2 podman-54967d7a10d70fb90c0e163ff78c15036518f2d2.zip |
Update containernetworking/plugins to current master
We need to pick up changes to the netns packages that are not yet
in a released tag.
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #1165
Approved by: baude
Diffstat (limited to 'vendor/github.com/containernetworking/plugins/README.md')
-rw-r--r-- | vendor/github.com/containernetworking/plugins/README.md | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vendor/github.com/containernetworking/plugins/README.md b/vendor/github.com/containernetworking/plugins/README.md index f0e444355..864601763 100644 --- a/vendor/github.com/containernetworking/plugins/README.md +++ b/vendor/github.com/containernetworking/plugins/README.md @@ -4,12 +4,14 @@ # 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`: Creates a loopback interface -* `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`: Set the state of loopback interface to up. +* `macvlan`: Creates a new MAC address, forwards all traffic to that to the container. * `ptp`: Creates a veth pair. * `vlan`: Allocates a vlan device. |