Michael Crosby bec84fb562 Merge branch 'master' into add-libcontainer ...

Conflicts:
	execdriver/termconsole.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ce08083f9cd23e8f5e44228b0b73884bcf2f3562
Component: engine

2014-02-26 12:55:24 -08:00

components/engine

Merge branch 'master' into add-libcontainer

2014-02-26 12:55:24 -08:00

Description

Интерфейс командной строки Docker

280 MiB

Languages

Go 92%

Shell 5.5%

Dockerfile 1.1%

Go-Checksums 0.9%

Makefile 0.3%

Other 0.2%