vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge branch 'master' into libcontainer-fixes

Browse source 
Conflicts:
	pkg/libcontainer/README.md
	pkg/libcontainer/container.json

Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
This commit is contained in:
Rohit Jnagal 2014-04-28 23:04:04 +00:00
commit 8cb62581de
23 changed files with 1065 additions and 554 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libcontainer/container_test.go
View file

@ -56,14 +56,4 @@ func TestContainerJsonFormat(t *testing.T) {
t.Log("capabilities mask should not contain SYS_CHROOT")
t.Fail()
}
if container.Cgroups.CpuShares != 1024 {
t.Log("cpu shares not set correctly")
t.Fail()
}
if container.Cgroups.Memory != 5248000 {
t.Log("memory limit not set correctly")
t.Fail()
}
}