From 180e34d83f18268e77fe661ab688c4ce13dd69aa Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 6 Sep 2021 10:18:28 -0700 Subject: [PATCH] Merge pull request #104312 from liggitt/automated-cherry-pick-of-#104279-upstream-release-1.20 Automated cherry pick of #104279: Copy golang license to staging copies Kubernetes-commit: 6d10ec12b583266ba9d7fcd090274227b60a536c --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index fdd96af0f..45f6a8a07 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e k8s.io/api v0.0.0-20210712061735-c542627fda65 - k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37 + k8s.io/apimachinery v0.0.0-20210906171828-49b1894fec47 k8s.io/klog/v2 v2.4.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/yaml v1.2.0 @@ -35,5 +35,5 @@ require ( replace ( k8s.io/api => k8s.io/api v0.0.0-20210712061735-c542627fda65 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210906171828-49b1894fec47 ) diff --git a/go.sum b/go.sum index 2e236fe69..10e0a3ed7 100644 --- a/go.sum +++ b/go.sum @@ -427,8 +427,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20210712061735-c542627fda65 h1:hNU7BYfSkjgg4e6RiDnAcmCB0oowEB4KNUuAAYczqZQ= k8s.io/api v0.0.0-20210712061735-c542627fda65/go.mod h1:46MConCeKv5gXizJs2U/jhw5xCH0WBWbqGc5j5fAnaM= -k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37 h1:rz55eMOF7F/F4281jjtEB75DcQXeCPgjrNJPfcH9Yzc= -k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37/go.mod h1:kQa//VOAwyVwJ2+L9kOREbsnryfsGSkSM1przND4+mw= +k8s.io/apimachinery v0.0.0-20210906171828-49b1894fec47 h1:NkZOlTOry3gpmu5YLE8vfjdccgVI3rblJ3/yZCIHfHc= +k8s.io/apimachinery v0.0.0-20210906171828-49b1894fec47/go.mod h1:kQa//VOAwyVwJ2+L9kOREbsnryfsGSkSM1przND4+mw= 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.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=