From 588f1f184561e42d4e5d965f1a0d146bfbd64485 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 6 Sep 2021 06:24:29 -0700 Subject: [PATCH] Merge pull request #104313 from liggitt/automated-cherry-pick-of-#104279-upstream-release-1.19 Automated cherry pick of #104279: Copy golang license to staging copies Kubernetes-commit: 44a3aa90a777aa05e997cb827744597c06b70803 --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d9d1a24df..f36d12214 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 k8s.io/api v0.0.0-20210712061623-33e331166f19 - k8s.io/apimachinery v0.0.0-20210712060932-83e9e94b75f3 + k8s.io/apimachinery v0.0.0-20210906132429-14b653eeeb6b k8s.io/klog/v2 v2.2.0 k8s.io/utils v0.0.0-20200729134348-d5654de09c73 sigs.k8s.io/yaml v1.2.0 @@ -35,5 +35,5 @@ require ( replace ( k8s.io/api => k8s.io/api v0.0.0-20210712061623-33e331166f19 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712060932-83e9e94b75f3 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210906132429-14b653eeeb6b ) diff --git a/go.sum b/go.sum index 10b49a9d2..5521b6311 100644 --- a/go.sum +++ b/go.sum @@ -336,8 +336,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= k8s.io/api v0.0.0-20210712061623-33e331166f19 h1:1hGJsTEZSpiLSIWPG88ak62KnmY0GYSGY3qOXIn4+Ws= k8s.io/api v0.0.0-20210712061623-33e331166f19/go.mod h1:3YUNrS3YZCXipiLZ72bx8O/lWZN7wopU4mia01/MEg8= -k8s.io/apimachinery v0.0.0-20210712060932-83e9e94b75f3 h1:5l3oYNFwOPujQkVAkBKL/UzUH1IrwZkDRgW+FSrYvEY= -k8s.io/apimachinery v0.0.0-20210712060932-83e9e94b75f3/go.mod h1:RMyblyny2ZcDQ/oVE+lC31u7XTHUaSXEK2IhgtwGxfc= +k8s.io/apimachinery v0.0.0-20210906132429-14b653eeeb6b h1:lth07yuWZMfQGB3fyQYSThWXLcGR6huBMKyHkbOKLMc= +k8s.io/apimachinery v0.0.0-20210906132429-14b653eeeb6b/go.mod h1:RMyblyny2ZcDQ/oVE+lC31u7XTHUaSXEK2IhgtwGxfc= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=