Skip to content

Commit

Permalink
Merge pull request #18055 from sjenning/sync-cpu-manager
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Backport cpumanager checkpointing fixes

kubernetes/kubernetes#56191
kubernetes/kubernetes#54410

This plus #18051 fully syncs cpumanager with kube upstream.

@derekwaynecarr
  • Loading branch information
openshift-merge-robot authored Jan 14, 2018
2 parents 3c75f9a + aecd8ed commit 9e98436
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 80 deletions.
23 changes: 21 additions & 2 deletions vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_manager.go

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

2 changes: 2 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy.go

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

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

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

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

0 comments on commit 9e98436

Please sign in to comment.