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

..

lxc

Merge pull request #4282 from ibuildthecloud/jumbo-frames

2014-02-26 20:11:38 +02:00

native

Merge branch 'master' into add-libcontainer

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

driver.go

Move container.json and pid file into a root specific driver dir

2014-02-25 12:41:31 -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

termconsole.go

Merge branch 'master' into add-libcontainer

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