Skip to content

Commit 4ad3268

Browse files
authored
Merge pull request kubernetes#86975 from dims/update-hcsshim-v0.8.7-and-containerd-v1.3.2
Update to latest cadvisor and containerd (v1.3.3)
2 parents 0f1a27b + 04e0c93 commit 4ad3268

File tree

334 files changed

+20848
-5253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

334 files changed

+20848
-5253
lines changed

Godeps/LICENSES

Lines changed: 246 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 31 additions & 54 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 50 additions & 53 deletions
Large diffs are not rendered by default.

staging/src/k8s.io/api/go.sum

Lines changed: 11 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiextensions-apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/go-openapi/strfmt v0.19.3
1212
github.com/go-openapi/validate v0.19.5
1313
github.com/gogo/protobuf v1.3.1
14-
github.com/google/go-cmp v0.3.1
14+
github.com/google/go-cmp v0.4.0
1515
github.com/google/gofuzz v1.1.0
1616
github.com/google/uuid v1.1.1
1717
github.com/googleapis/gnostic v0.1.0

staging/src/k8s.io/apiextensions-apiserver/go.sum

Lines changed: 21 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apimachinery/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ require (
1212
github.com/gogo/protobuf v1.3.1
1313
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903
1414
github.com/golang/protobuf v1.3.2
15-
github.com/google/go-cmp v0.3.1
15+
github.com/google/go-cmp v0.4.0
1616
github.com/google/gofuzz v1.1.0
1717
github.com/google/uuid v1.1.1
1818
github.com/googleapis/gnostic v0.1.0
1919
github.com/hashicorp/golang-lru v0.5.1
2020
github.com/json-iterator/go v1.1.8
21-
github.com/kr/pretty v0.1.0 // indirect
21+
github.com/kr/pretty v0.2.0 // indirect
2222
github.com/modern-go/reflect2 v1.0.1
2323
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
2424
github.com/onsi/ginkgo v1.11.0 // indirect
2525
github.com/onsi/gomega v1.7.0 // indirect
2626
github.com/spf13/pflag v1.0.5
2727
github.com/stretchr/testify v1.4.0
28-
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
28+
golang.org/x/net v0.0.0-20200202094626-16171245cfb2
2929
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect
3030
golang.org/x/text v0.3.2 // indirect
31-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
31+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
3232
gopkg.in/inf.v0 v0.9.1
3333
gopkg.in/yaml.v2 v2.2.8
3434
k8s.io/klog v1.0.0

staging/src/k8s.io/apimachinery/go.sum

Lines changed: 11 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)