From b3ff053fb1b21356a7c26219cadebf97068ff418 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 9 Apr 2020 14:51:48 -0700 Subject: [PATCH] Merge pull request #89975 from liggitt/relist-timeout-1.18 Manual cherry pick of #89652: Fix client watch reestablishment handling of client-side timeouts Kubernetes-commit: c37f8ac0e1f85be80ce3a91c0bf3f9869aaa200b --- 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 ff819a5a3..8611e2143 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -352,7 +352,7 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "105e0c6d63f1" + "Rev": "ab1231685bfe" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index d48fecd4b..6c55b886d 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-20200316191010-3b4a996260a0 - k8s.io/apimachinery v0.0.0-20200321205243-105e0c6d63f1 + k8s.io/apimachinery v0.0.0-20200409215148-ab1231685bfe k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 sigs.k8s.io/yaml v1.2.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-20200316191010-3b4a996260a0 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200321205243-105e0c6d63f1 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200409215148-ab1231685bfe ) diff --git a/go.sum b/go.sum index a5a68fd7a..d6f82a023 100644 --- a/go.sum +++ b/go.sum @@ -183,7 +183,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-20200316191010-3b4a996260a0/go.mod h1:dQFmApLGF1AzHBoCa9z1a7ftM/1nZEAoknHzuttq6eY= -k8s.io/apimachinery v0.0.0-20200321205243-105e0c6d63f1/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= +k8s.io/apimachinery v0.0.0-20200409215148-ab1231685bfe/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= 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=