Merge pull request kubernetes#29351 from dubstack/update-libcontainer2

Automatic merge from submit-queue Update Libcontainer This PR is linked to the upstream issue kubernetes#27204 for introducing pod level cgroups into Kubernetes. It just updates the Libcontainer dependency. @vishh PTAL
dgonzalez · Jul 23, 2016 · ddc3d8e · ddc3d8e
2 parents 75689dd + 0046760
commit ddc3d8e
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 42 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go