jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'pr-1573' 

Fix systemd cgroup after memory type changed

LGTMs: @crosbymichael @cyphar
Closes #1573
This commit is contained in:
Aleksa Sarai 2017-08-25 23:55:27 +10:00
parent 4e33faefa7 acaf6897f5
commit 4d6e6720a7
No known key found for this signature in database
GPG Key ID: 9E18AA267DDB8DB4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcontainer/cgroups/systemd/apply_systemd.go
View File

@ -260,7 +260,7 @@ func (m *Manager) Apply(pid int) error {
if c.Resources.Memory != 0 {
properties = append(properties,
newProp("MemoryLimit", c.Resources.Memory))
newProp("MemoryLimit", uint64(c.Resources.Memory)))
}
if c.Resources.CpuShares != 0 {