Merge branch 'pr-1573'

Fix systemd cgroup after memory type changed LGTMs: @crosbymichael @cyphar Closes #1573
opencontainers · Aug 25, 2017 · 4d6e672 · 4d6e672
2 parents 4e33fae + acaf689
commit 4d6e672
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libcontainer/cgroups/systemd/apply_systemd.go b/libcontainer/cgroups/systemd/apply_systemd.go
@@ -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 {