Rohit Jnagal 7fb7f768a7 Merge branch 'master' into libcontainer-fixes ...

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

Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: c44c51e3ce1680ec2a74fc62f246490f61d7590c
Component: engine

2014-04-28 23:04:04 +00:00

components/engine

Merge branch 'master' into libcontainer-fixes

2014-04-28 23:04:04 +00:00

Description

No description provided

310 MiB

Languages

Go 92%

Shell 5.5%

Dockerfile 1.1%

Go-Checksums 0.9%

Makefile 0.3%

Other 0.2%