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
openshift · Jan 10, 2018 · 9977733 · 9977733
2 parents ec0e90f + b65c74a
commit 9977733
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_manager_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_manager_test.go