Merge remote-tracking branch 'origin/master' into release-1.19

Kubernetes-commit: 6acb6808a4ce366f66037811a4009d285db951f0
kubernetes · Aug 21, 2020 · b63a0c8 · b63a0c8
1 parent ca7d1f7
commit b63a0c8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/go.mod b/go.mod
@@ -37,5 +37,3 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.0.1
 	sigs.k8s.io/yaml v1.2.0
 )
-
-replace k8s.io/apimachinery => ../apimachinery