Skip to content

Commit e7f7723

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#34403 from derekwaynecarr/update-libcontainer
Automatic merge from submit-queue Update godeps for libcontainer+cadvisor Needed to unblock more progress on pod cgroup. /cc @vishh @dchen1107 @timstclair
2 parents 0b62733 + 62e1759 commit e7f7723

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+586
-452
lines changed

‎Godeps/Godeps.json

Lines changed: 115 additions & 115 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/kubelet/cm/helpers_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
// GetCgroupSubsystems returns information about the mounted cgroup subsystems
2626
func GetCgroupSubsystems() (*CgroupSubsystems, error) {
2727
// get all cgroup mounts.
28-
allCgroups, err := libcontainercgroups.GetCgroupMounts()
28+
allCgroups, err := libcontainercgroups.GetCgroupMounts(true)
2929
if err != nil {
3030
return &CgroupSubsystems{}, err
3131
}

‎vendor/github.com/google/cadvisor/collector/config.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/google/cadvisor/collector/generic_collector.go

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)