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
openshift · Sep 19, 2018 · ad967f1 · ad967f1
2 parents 340f7a8 + 6bcab3d
commit ad967f1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/filters/BUILD b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/filters/BUILD
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/filters/timeout_test.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/filters/timeout_test.go