From 1a7b32ce3b1585089c6c2310231b7c29fc35a61d Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 21 May 2021 12:58:11 -0700 Subject: [PATCH] Merge pull request #102196 from kolyshkin/automated-cherry-pick-of-#102147-upstream-release-1.21 Automated cherry pick of #102147: vendor: bump runc to rc95 Kubernetes-commit: 133f66aa603c4624ff3544f26f54a153a54c6f94 --- Godeps/Godeps.json | 4 ++-- go.mod | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 40d785d7d..7ef0aa8b7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -116,7 +116,7 @@ }, { "ImportPath": "github.com/google/go-cmp", - "Rev": "v0.5.2" + "Rev": "v0.5.4" }, { "ImportPath": "github.com/google/gofuzz", @@ -264,7 +264,7 @@ }, { "ImportPath": "golang.org/x/sys", - "Rev": "a50acf3fe073" + "Rev": "d19ff857e887" }, { "ImportPath": "golang.org/x/term", diff --git a/go.mod b/go.mod index cfce3e9b6..2e3dfcc84 100644 --- a/go.mod +++ b/go.mod @@ -39,5 +39,3 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.1.0 sigs.k8s.io/yaml v1.2.0 ) - -replace k8s.io/apimachinery => ../apimachinery