Merge pull request #17121 from joelsmith/stage

Automatic merge from submit-queue. [stage] UPSTREAM: 54828: trigger endpoint update on pod deletion xref #17120
openshift · Nov 2, 2017 · 81f9fab · 81f9fab
2 parents 6e3c76a + df5a165
commit 81f9fab
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