Michael Crosby 4f321caf5c Merge branch 'master' into add-libcontainer ...

Conflicts:
	runtime.go

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

2014-02-24 20:35:12 -08:00

..

docker

Improve logging for nsinit

2014-02-24 18:38:36 -08:00

lxc

Merge branch 'master' into add-libcontainer

2014-02-24 20:35:12 -08:00

driver.go

Compile nsinit into docker for use with dockerinit

2014-02-24 12:21:13 -08:00

MAINTAINERS

Move RootIsShared to lxc driver

2014-01-17 17:42:22 -08:00

pipes.go

Move current tty and pipe impl to lxc driver

2014-02-21 13:27:34 -08:00