From f55f946138b40df3ec9b1c9f3edde10fbc47883d Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 29 Jan 2020 07:33:04 -0800 Subject: [PATCH] Merge pull request #87599 from mikedanese/rctx-cleanup various context related cleanups to rest.Request Kubernetes-commit: cad44602e1188a1feff0bc085dc8286c6c5d3640 --- Godeps/Godeps.json | 2 +- go.mod | 4 ++-- go.sum | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d663e1c8..e841b2d6 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -352,7 +352,7 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "656274101191" + "Rev": "6e7abe710169" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 4b01f42d..e53a4207 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 google.golang.org/appengine v1.5.0 // indirect k8s.io/api v0.0.0-20200124032216-924612ff3bca - k8s.io/apimachinery v0.0.0-20200125072041-656274101191 + k8s.io/apimachinery v0.0.0-20200127192101-6e7abe710169 k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20191217005138-9e5e9d854fcc sigs.k8s.io/yaml v1.1.0 @@ -39,5 +39,5 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 k8s.io/api => k8s.io/api v0.0.0-20200124032216-924612ff3bca - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200125072041-656274101191 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200127192101-6e7abe710169 ) diff --git a/go.sum b/go.sum index 4d091945..162b867f 100644 --- a/go.sum +++ b/go.sum @@ -189,7 +189,7 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.0.0-20200124032216-924612ff3bca/go.mod h1:WYGNSV/2aSDAMvHS6cmemi/htNIV58hkcMDRVUi/6tw= -k8s.io/apimachinery v0.0.0-20200125072041-656274101191/go.mod h1:OAtNFcsmF2+2JlejTQ9O5Qu7PHEA9GlSn28VjH8ssNs= +k8s.io/apimachinery v0.0.0-20200127192101-6e7abe710169/go.mod h1:OAtNFcsmF2+2JlejTQ9O5Qu7PHEA9GlSn28VjH8ssNs= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=