Merge pull request #16778 from aveshagarwal/master-scheduler-backport…

…-52515 Automatic merge from submit-queue (batch tested with PRs 15807, 16778, 16801, 16804, 16793). UPSTREAM: 52515: Clarify predicates name to clean confusing. @sjenning @stevekuznetsov The commits are a bit modified for 3.7. Also the title seems a bit confusing but I just copied it from upstream PR.
openshift · Oct 12, 2017 · b46d860 · b46d860
2 parents 18c29ac + e35de9a
commit b46d860
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/core/generic_scheduler.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/core/generic_scheduler.go
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/core/generic_scheduler_test.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/core/generic_scheduler_test.go
diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/scheduler_test.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/scheduler_test.go