Skip to content

Commit 7bb08c0

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #16419 from sjenning/cadv-updates
Automatic merge from submit-queue cadvisor/runc updates Support CRI-O: google/cadvisor#1741 Fix memory stats: google/cadvisor#1728 opencontainers/runc#1378 @derekwaynecarr
2 parents 3fa1968 + 59f8075 commit 7bb08c0

File tree

16 files changed

+937
-11
lines changed

16 files changed

+937
-11
lines changed

Diff for: ‎vendor/github.com/google/cadvisor/container/container.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/google/cadvisor/container/crio/client.go

+130
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/google/cadvisor/container/crio/client_test.go

+49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/google/cadvisor/container/crio/factory.go

+170
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)