Skip to content

Commit 4ab8fb4

Browse files
Merge pull request #96425 from bobbypage/vendor-cadvisor-v0.38
Vendor cadvisor v0.38.4 Kubernetes-commit: 41533ecec8966636554faba44368a36d5d6c5347
1 parent 4bbb204 commit 4ab8fb4

File tree

3 files changed

+51
-34
lines changed

3 files changed

+51
-34
lines changed

Godeps/Godeps.json

+45-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

+4-5
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ require (
2626
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
2727
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
2828
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
29-
k8s.io/api v0.0.0
30-
k8s.io/apimachinery v0.0.0
29+
k8s.io/api v0.0.0-20201114005542-ccdf63aa6ee8
30+
k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee
3131
k8s.io/klog/v2 v2.4.0
3232
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
3333
sigs.k8s.io/yaml v1.2.0
3434
)
3535

3636
replace (
37-
k8s.io/api => ../api
38-
k8s.io/apimachinery => ../apimachinery
39-
k8s.io/client-go => ../client-go
37+
k8s.io/api => k8s.io/api v0.0.0-20201114005542-ccdf63aa6ee8
38+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee
4039
)

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
433433
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
434434
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
435435
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
436+
k8s.io/api v0.0.0-20201114005542-ccdf63aa6ee8/go.mod h1:gWbPsp77mlP9ze/MsTGn1keIW3+fq/3AORAT453pf04=
437+
k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee/go.mod h1:legT3ySyyLFPOHkL8znm+gYpXm5mr3eGzpY2TFuH//M=
436438
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
437439
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
438440
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=

0 commit comments

Comments
 (0)