Commit ecf754b

openshift-merge-robot

authored

Merge pull request #18503 from aveshagarwal/master-rhbz-1540822

Automatic merge from submit-queue (batch tested with PRs 18503, 18399, 13701, 18513, 18515). UPSTREAM: 59449: Fix to register priority function ResourceLimitsPriority correctly. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540822 Upstream PR is merged: kubernetes/kubernetes#59449 @derekwaynecarr

2 parents 953814c + 775f4e2 commit ecf754bCopy full SHA for ecf754b

1 file changed

+5

-5

lines changed

vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults
- defaults.go

1 file changed

+5

-5

lines changed

`‎vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go`

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)