Skip to content

Commit

Permalink
Merge pull request #43113 from dashpole/release-1.5
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

[Release 1.5] Update cadvisor godeps to v0.25.0

This PR updates the cAdvisor Godeps for the 1.5 branch.  This includes a number of critical bugfixes including:
[cadvisor#1558](google/cadvisor#1558), [cadvisor#1573](google/cadvisor#1573)

This is a large change on account of the aws dependency update.  However, many affected users have requested that this be cherrypicked into 1.5 and 1.4 (coming soon)

```release-note
- Disable thin_ls due to excessive iops
- Ignore .mount cgroups, fixing dissappearing stats
- Fix wc goroutine leak
- Update aws-sdk-go dependency to 1.6.10
```

cc @calebamiles [remember this?](#40095 (comment)) @jessfraz @timstclair
  • Loading branch information
Kubernetes Submit Queue committed Mar 22, 2017
2 parents 52f6d3f + b631148 commit 6aa1195
Show file tree
Hide file tree
Showing 100 changed files with 68,575 additions and 23,093 deletions.
429 changes: 225 additions & 204 deletions Godeps/Godeps.json

Large diffs are not rendered by default.

858 changes: 849 additions & 9 deletions Godeps/LICENSES

Large diffs are not rendered by default.

12,259 changes: 0 additions & 12,259 deletions vendor/BUILD

This file was deleted.

56 changes: 48 additions & 8 deletions vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go

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

85 changes: 72 additions & 13 deletions vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go

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

10 changes: 9 additions & 1 deletion vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.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.

10 changes: 10 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go

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

35 changes: 27 additions & 8 deletions vendor/github.com/aws/aws-sdk-go/aws/client/client.go

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

Loading

0 comments on commit 6aa1195

Please sign in to comment.