Merge pull request #17274 from runcom/cri-o-sysctls

Automatic merge from submit-queue (batch tested with PRs 16843, 17095, 17267, 17261, 17274). UPSTREAM: 50390: Admit sysctls for other runtime. Fix https://bugzilla.redhat.com/show_bug.cgi?id=1508781 @smarterclayton @mrunalp PTAL Signed-off-by: Antonio Murdaca <[email protected]>
openshift · Nov 14, 2017 · 653c547 · 653c547
2 parents 2c11f9d + bc05917
commit 653c547
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/sysctl/runtime.go b/vendor/k8s.io/kubernetes/pkg/kubelet/sysctl/runtime.go