Merge pull request #23609 from Microsoft/WindowsMemory

Windows: Re-enabled support for memory limit
Upstream-commit: 1f3efe67764b6f8616dd12271747863c17f36f30
Component: engine
This commit is contained in:
Alexander Morozov
2016-06-16 10:08:17 -07:00
committed by GitHub
+2 -2
View File
@@ -176,8 +176,8 @@ func (daemon *Daemon) createSpec(c *container.Container) (*libcontainerd.Spec, e
Shares: &cpuShares,
},
Memory: &windowsoci.Memory{
//TODO Limit: ...,
//TODO Reservation: ...,
Limit: &c.HostConfig.Memory,
//TODO Reservation: ...,
},
Network: &windowsoci.Network{
//TODO Bandwidth: ...,