Skip to content

Commit

Permalink
Merge pull request kubernetes#50629 from sjenning/bump-cadvisor
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 50893, 50913, 50963, 50629, 50640)

bump(github.com/google/cadvisor): 27e1acbb4ef0fe1889208b21f8f4a6d0863e02f6

Bump cadvisor dep to include google/cadvisor@556c7b1.

This is required for supporting huge pages for 1.8

kubernetes/community#837
kubernetes/enhancements#275

@dashpole @derekwaynecarr @eparis @jeremyeder
  • Loading branch information
Kubernetes Submit Queue committed Aug 22, 2017
2 parents cb1220c + fa71aac commit 9292074
Show file tree
Hide file tree
Showing 20 changed files with 348 additions and 171 deletions.
164 changes: 82 additions & 82 deletions Godeps/Godeps.json

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

4 changes: 2 additions & 2 deletions vendor/github.com/google/cadvisor/api/handler.go

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

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

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

Loading

0 comments on commit 9292074

Please sign in to comment.