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
openshift · Sep 19, 2017 · 7bb08c0 · 7bb08c0
2 parents 3fa1968 + 59f8075
commit 7bb08c0
Show file tree

Hide file tree

Showing 16 changed files with 937 additions and 11 deletions.
diff --git a/vendor/github.com/google/cadvisor/container/container.go b/vendor/github.com/google/cadvisor/container/container.go
diff --git a/vendor/github.com/google/cadvisor/container/crio/client.go b/vendor/github.com/google/cadvisor/container/crio/client.go
diff --git a/vendor/github.com/google/cadvisor/container/crio/client_test.go b/vendor/github.com/google/cadvisor/container/crio/client_test.go
diff --git a/vendor/github.com/google/cadvisor/container/crio/factory.go b/vendor/github.com/google/cadvisor/container/crio/factory.go