Charles Hooper 55fc055158 Merge remote-tracking branch 'upstream/master' into vagrant11-providers ...

Conflicts:
	puppet/modules/docker/manifests/init.pp
Upstream-commit: 2b090320beae64e1bf15102da5dfe96937a21a77
Component: engine

2013-03-27 01:09:22 +00:00

components/engine

Merge remote-tracking branch 'upstream/master' into vagrant11-providers

2013-03-27 01:09:22 +00:00

S

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%