Skip to content

Commit 9977733

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #18051 from sjenning/pick-57247
Automatic merge from submit-queue (batch tested with PRs 17932, 18037, 17479, 18051, 18052). UPSTREAM: 57247: cpumanager: Propagate error up instead panic kubernetes/kubernetes#57247 xref https://bugzilla.redhat.com/show_bug.cgi?id=1532967 @derekwaynecarr
2 parents ec0e90f + b65c74a commit 9977733

File tree

2 files changed

+6
-28
lines changed

2 files changed

+6
-28
lines changed

‎vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_manager.go

Lines changed: 4 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_manager_test.go

Lines changed: 2 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)