Victor Vieux 8ccf0a6281 Merge remote-tracking branch 'origin/master' into bump_v1.2.0 ...

Conflicts:
	VERSION
	daemon/container.go
	daemon/daemon.go

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 380129d0d7e9b2dbec27aef7186ce5eddd3a3076
Component: engine

2014-08-20 20:19:03 +00:00

components/engine

Merge remote-tracking branch 'origin/master' into bump_v1.2.0

2014-08-20 20:19:03 +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%