diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-06 17:27:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 17:27:50 -0800 |
| commit | b83b07cb4748f983c21b08b2ba015561cf664989 (patch) | |
| tree | 049a5ed444ae3724ee1fd96f1d8d8f187f3d94c8 /vendor/github.com/opencontainers/runc/libcontainer/README.md | |
| parent | 49a474c4b747bb83e36cda335ac3ae1ce5ae9f0a (diff) | |
| parent | 43686072d3ff559abb0aea865509ae85f8a301de (diff) | |
| download | podman-b83b07cb4748f983c21b08b2ba015561cf664989.tar.gz podman-b83b07cb4748f983c21b08b2ba015561cf664989.tar.bz2 podman-b83b07cb4748f983c21b08b2ba015561cf664989.zip | |
Merge pull request #2082 from rhatdan/runc
Update vendor of runc
Diffstat (limited to 'vendor/github.com/opencontainers/runc/libcontainer/README.md')
| -rw-r--r-- | vendor/github.com/opencontainers/runc/libcontainer/README.md | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/README.md b/vendor/github.com/opencontainers/runc/libcontainer/README.md index 42f3efe56..1d7fa04c0 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/README.md +++ b/vendor/github.com/opencontainers/runc/libcontainer/README.md @@ -148,6 +148,7 @@ config := &configs.Config{ {Type: configs.NEWPID}, {Type: configs.NEWUSER}, {Type: configs.NEWNET}, + {Type: configs.NEWCGROUP}, }), Cgroups: &configs.Cgroup{ Name: "test-container", @@ -323,6 +324,7 @@ generated when building libcontainer with docker. ## Copyright and license -Code and documentation copyright 2014 Docker, inc. Code released under the Apache 2.0 license. -Docs released under Creative commons. - +Code and documentation copyright 2014 Docker, inc. +The code and documentation are released under the [Apache 2.0 license](../LICENSE). +The documentation is also released under Creative Commons Attribution 4.0 International License. +You may obtain a copy of the license, titled CC-BY-4.0, at http://creativecommons.org/licenses/by/4.0/. |