toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #27419 from yongtang/10162016-warning

Browse Source 
Fix an incorrect `WARNING` output in `docker run/create`
Upstream-commit: 55cd8f53c9bc2e1d53ff3761c1109309fee6f4f7
Component: engine
This commit is contained in:
Lei Jitang
2016-10-17 18:37:03 +08:00
committed by GitHub
parent 73564e83d6 91be57517e
commit a08dc5dfdf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/daemon_unix.go
View File

@ -351,7 +351,7 @@ func verifyContainerResources(resources *containertypes.Resources, sysInfo *sysi
return warnings, fmt.Errorf("CPU cfs quota can not be less than 1ms (i.e. 1000)")
}
if resources.CPUPercent > 0 {
warnings = append(warnings, "%s does not support CPU percent. Percent discarded.", runtime.GOOS)
warnings = append(warnings, fmt.Sprintf("%s does not support CPU percent. Percent discarded.", runtime.GOOS))
logrus.Warnf("%s does not support CPU percent. Percent discarded.", runtime.GOOS)
resources.CPUPercent = 0
}