Merge pull request #15889 from sjenning/pick-50934-1.6

Automatic merge from submit-queue UPSTREAM: 50934: Skip non-update endpoint updates xref kubernetes/kubernetes#50934 and kubernetes/kubernetes#51144 master PR: #15888 xref https://bugzilla.redhat.com/show_bug.cgi?id=1481603 @joelsmith @derekwaynecarr @eparis @smarterclayton
openshift · Sep 15, 2017 · 95f63d9 · 95f63d9
2 parents afb8ebb + 846354e
commit 95f63d9
Show file tree

Hide file tree

Showing 3 changed files with 226 additions and 14 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/endpoint/BUILD b/vendor/k8s.io/kubernetes/pkg/controller/endpoint/BUILD
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