clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 04:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14032 from lizf-os/fix-sysinfo-regression

Browse Source 
Fix sysinfo regression
This commit is contained in:
Alexander Morozov
2015-06-19 11:00:13 -07:00
parent df73d5e0cd 4398693201
commit 3ee67caf3b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sysinfo/sysinfo_linux.go
+2 -2
View File
@@ -38,7 +38,7 @@ func checkCgroupMem(quiet bool) *cgroupMemInfo {
if !quiet {
logrus.Warnf("Your kernel does not support cgroup memory limit: %v", err)
}
return nil
return info
}
info.MemoryLimit = true
@@ -61,7 +61,7 @@ func checkCgroupCpu(quiet bool) *cgroupCpuInfo {
if !quiet {
logrus.Warn(err)
}
return nil
return info
}
info.CpuCfsPeriod = cgroupEnabled(mountPoint, "cpu.cfs_period_us")