Merge pull request #16016 from ravisantoshgudimetla/release-3.6

Automatic merge from submit-queue UPSTREAM: 45352: Pod (Anti)affinity shouldn't be respected across namespaces. xref: https://bugzilla.redhat.com/show_bug.cgi?id=1483119 Upstream fix+unit test: kubernetes/kubernetes#45352 kubernetes/kubernetes#45152 /cc @sjenning
openshift · Sep 5, 2017 · 6f6641c · 6f6641c
2 parents 42b4710 + d193915
commit 6f6641c
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 10 deletions.
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates.go
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go