docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/sysinfo/sysinfo_linux.go
View File

@ -38,7 +38,7 @@ func checkCgroupMem(quiet bool) *cgroupMemInfo {
if !quiet { if !quiet {
logrus.Warnf("Your kernel does not support cgroup memory limit: %v", err) logrus.Warnf("Your kernel does not support cgroup memory limit: %v", err)
} }
return nil return info
} }
info.MemoryLimit = true info.MemoryLimit = true
@ -61,7 +61,7 @@ func checkCgroupCpu(quiet bool) *cgroupCpuInfo {
if !quiet { if !quiet {
logrus.Warn(err) logrus.Warn(err)
} }
return nil return info
} }
info.CpuCfsPeriod = cgroupEnabled(mountPoint, "cpu.cfs_period_us") info.CpuCfsPeriod = cgroupEnabled(mountPoint, "cpu.cfs_period_us")