From 585dacffb22b519fe2e477d2169a30bc91cf0727 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:04:01 -0700
Subject: [PATCH] Merge pull request #89976 from liggitt/relist-timeout-1.17

Manual cherry pick of #89652: Fix client watch reestablishment handling of client-side timeouts

Kubernetes-commit: eefc357ebdf45c9ec5839dcccf784cf5e9c5e1e7
---
 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 f771db3bc..6bc16d7d8 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -352,7 +352,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "491fc9063aba"
+			"Rev": "7378bafd8ae2"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 10b84e363..91aae1f94 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-20200404061942-2a93acf49b83
-	k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba
+	k8s.io/apimachinery v0.0.0-20200410010401-7378bafd8ae2
 	k8s.io/klog v1.0.0
 	k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
 	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-20200404061942-2a93acf49b83
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200410010401-7378bafd8ae2
 )
diff --git a/go.sum b/go.sum
index e0c98480d..32a00d164 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-20200404061942-2a93acf49b83/go.mod h1:9kJrdiqYr6QQVO1OhJlqhEFfJnC0bdfwa8VwazjeL+U=
-k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba/go.mod h1:ioIo1G/a+uONV7Tv+ZmCbMG1/a3kVw5YcDdncd8ugQ0=
+k8s.io/apimachinery v0.0.0-20200410010401-7378bafd8ae2/go.mod h1:ioIo1G/a+uONV7Tv+ZmCbMG1/a3kVw5YcDdncd8ugQ0=
 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=