Merge pull request #29154 from vishh/cadvisor-bump-1.3

Fix working_set calculation in kubelet
kubernetes · Jul 20, 2016 · 6cf50ee · 6cf50ee
2 parents d11103e + 3392bdf
commit 6cf50ee
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 91 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/vendor/github.com/google/cadvisor/container/libcontainer/helpers.go b/vendor/github.com/google/cadvisor/container/libcontainer/helpers.go