Merge pull request #18246 from tnozicka/backport-watch-cache-fix-5854…

…7-release-3.7 Automatic merge from submit-queue. [3.7] UPSTREAM: 58572: Automated cherry pick of #58547: Send correct resource version for delete events from watch Backport of #18233 via kubernetes/kubernetes#58572 /assign @liggitt
openshift · Jan 24, 2018 · 6aeba0c · 6aeba0c
2 parents 12b1b3a + e380384
commit 6aeba0c
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 61 deletions.
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/storage/BUILD b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/storage/BUILD
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/storage/cacher.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/storage/cacher.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/storage/cacher_whitebox_test.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/storage/cacher_whitebox_test.go