Skip to content

Commit 8df661e

Browse files
Merge pull request #95620 from roycaihw/automated-cherry-pick-of-#95427-upstream-release-1.17
Automated cherry pick of #95427: don't cache transports for incomparable configs Kubernetes-commit: 97ec03fb316f04ebafce700c547e48fa07293cb3
1 parent b7e3da0 commit 8df661e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Godeps/Godeps.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
3030
google.golang.org/appengine v1.5.0 // indirect
3131
k8s.io/api v0.0.0-20200903132056-f4b723619c71
32-
k8s.io/apimachinery v0.0.0-20200903131703-e01b6f647e0d
32+
k8s.io/apimachinery v0.0.0-20200909211649-657cd094317c
3333
k8s.io/klog v1.0.0
3434
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
3535
sigs.k8s.io/yaml v1.1.0
@@ -39,5 +39,5 @@ replace (
3939
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
4040
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
4141
k8s.io/api => k8s.io/api v0.0.0-20200903132056-f4b723619c71
42-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200903131703-e01b6f647e0d
42+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200909211649-657cd094317c
4343
)

go.sum

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
191191
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
192192
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
193193
k8s.io/api v0.0.0-20200903132056-f4b723619c71/go.mod h1:6jldM/f+1srnQ6exBO4L0duPFhjZA0QXAuxBg1nxJd0=
194-
k8s.io/apimachinery v0.0.0-20200903131703-e01b6f647e0d/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk=
194+
k8s.io/apimachinery v0.0.0-20200909211649-657cd094317c/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk=
195195
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
196196
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
197197
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

0 commit comments

Comments
 (0)