Merge pull request #17120 from joelsmith/master

Automatic merge from submit-queue (batch tested with PRs 17089, 17120). UPSTREAM: 54828: trigger endpoint update on pod deletion xref kubernetes/kubernetes#54828
openshift · Nov 2, 2017 · 3ea2451 · 3ea2451
2 parents c7c7e89 + 7358f80
commit 3ea2451
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller_test.go b/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller_test.go