Skip to content

Commit 248eabb

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #19028 from derekwaynecarr/bz-1554471
Automatic merge from submit-queue. UPSTREAM: 61294: Fix cpu cfs quota flag with pod cgroups https://bugzilla.redhat.com/show_bug.cgi?id=1554471 Upstream: kubernetes/kubernetes#61294
2 parents 63504cd + f491df9 commit 248eabb

File tree

7 files changed

+54
-11
lines changed

7 files changed

+54
-11
lines changed

‎vendor/k8s.io/kubernetes/cmd/kubelet/app/server.go

+1
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/container_manager.go

+1
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/container_manager_linux.go

+1
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/helpers_linux.go

+6-1
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/helpers_linux_test.go

+41-8
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/helpers_unsupported.go

+1-1
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/pod_container_manager_linux.go

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

0 commit comments

Comments
 (0)