Skip to content

Commit 48f6b99

Browse files
Merge pull request #1726 from sjenning/bump-runc
Bump runc
2 parents a1e1ede + 2ab9f25 commit 48f6b99

Some content is hidden

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

66 files changed

+3365
-757
lines changed

Godeps/Godeps.json

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

manager/manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn
136136
}
137137

138138
// Detect the container we are running on.
139-
selfContainer, err := cgroups.GetThisCgroupDir("cpu")
139+
selfContainer, err := cgroups.GetOwnCgroupPath("cpu")
140140
if err != nil {
141141
return nil, err
142142
}

vendor/github.com/mrunalp/fileutils/.gitignore

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

vendor/github.com/mrunalp/fileutils/LICENSE

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

vendor/github.com/mrunalp/fileutils/MAINTAINERS

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

vendor/github.com/mrunalp/fileutils/README.md

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

0 commit comments

Comments
 (0)