Merge pull request kubernetes#28140 from ronnielai/dep

Automatic merge from submit-queue Updated cadvisor dependency kubernetes#21546
lavalamp · Jun 30, 2016 · 45a1c6d · 45a1c6d
2 parents f2ddd60 + 4dfff95
commit 45a1c6d
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 84 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/vendor/github.com/google/cadvisor/info/v2/container.go b/vendor/github.com/google/cadvisor/info/v2/container.go
diff --git a/vendor/github.com/google/cadvisor/manager/manager.go b/vendor/github.com/google/cadvisor/manager/manager.go
diff --git a/vendor/github.com/google/cadvisor/version/VERSION b/vendor/github.com/google/cadvisor/version/VERSION