Skip to content

Commit

Permalink
Merge pull request #1726 from sjenning/bump-runc
Browse files Browse the repository at this point in the history
Bump runc
  • Loading branch information
derekwaynecarr authored Aug 22, 2017
2 parents a1e1ede + 2ab9f25 commit 48f6b99
Show file tree
Hide file tree
Showing 66 changed files with 3,365 additions and 757 deletions.
80 changes: 47 additions & 33 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion manager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn
}

// Detect the container we are running on.
selfContainer, err := cgroups.GetThisCgroupDir("cpu")
selfContainer, err := cgroups.GetOwnCgroupPath("cpu")
if err != nil {
return nil, err
}
Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/mrunalp/fileutils/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

191 changes: 191 additions & 0 deletions vendor/github.com/mrunalp/fileutils/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/mrunalp/fileutils/MAINTAINERS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/github.com/mrunalp/fileutils/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 48f6b99

Please sign in to comment.