Merge branch 'pr-1573'

cyphar · cyphar · commit 4d6e6720a7c8 · 2017-08-25T23:55:27.000+10:00
Fix systemd cgroup after memory type changed LGTMs: @crosbymichael @cyphar Closes opencontainers#1573
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 {

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ func (m *Manager) Apply(pid int) error {`
`260`	`260`
`261`	`261`	`if c.Resources.Memory != 0 {`
`262`	`262`	`properties = append(properties,`
`263`		`- newProp("MemoryLimit", c.Resources.Memory))`
	`263`	`+ newProp("MemoryLimit", uint64(c.Resources.Memory)))`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`if c.Resources.CpuShares != 0 {`