Merge pull request #21194 from openshift-cherrypick-robot/cherry-pick…

…-21179-to-release-3.11 [release-3.11] UPSTREAM: 68563 : fix scheduler crash when Prioritize Map function failed
openshift · Oct 9, 2018 · 0cbc58b · 0cbc58b
2 parents f7602dd + 74660e2
commit 0cbc58b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/core/generic_scheduler.go b/vendor/k8s.io/kubernetes/pkg/scheduler/core/generic_scheduler.go
diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/core/generic_scheduler_test.go b/vendor/k8s.io/kubernetes/pkg/scheduler/core/generic_scheduler_test.go