Skip to content

Commit ad967f1

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #20979 from openshift-cherrypick-robot/cherry-pick-20848-to-release-3.11
[release-3.11] UPSTREAM: 68008: apiserver: forward panic in WithTimeout filter
2 parents 340f7a8 + 6bcab3d commit ad967f1

File tree

3 files changed

+36
-8
lines changed

3 files changed

+36
-8
lines changed

‎vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/filters/BUILD

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

‎vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/filters/timeout_test.go

Lines changed: 27 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)