Merge pull request #96425 from bobbypage/vendor-cadvisor-v0.38

Vendor cadvisor v0.38.4 Kubernetes-commit: 41533ecec8966636554faba44368a36d5d6c5347
kubernetes · Nov 14, 2020 · 65a627a · 65a627a
1 parent bd89392
commit 65a627a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/go.mod b/go.mod
@@ -38,5 +38,3 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.0.2
 	sigs.k8s.io/yaml v1.2.0
 )
-
-replace k8s.io/apimachinery => ../apimachinery