Skip to content

Commit

Permalink
Merge pull request #102196 from kolyshkin/automated-cherry-pick-of-#1…
Browse files Browse the repository at this point in the history
…02147-upstream-release-1.21

Automated cherry pick of #102147: vendor: bump runc to rc95

Kubernetes-commit: 133f66aa603c4624ff3544f26f54a153a54c6f94
  • Loading branch information
k8s-publishing-bot committed May 21, 2021
1 parent 2c210a7 commit 1a7b32c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 1a7b32c

Please sign in to comment.