Michael Crosby 27a43692c2 Merge branch 'master' into add-libcontainer ... Conflicts: runtime.go Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)		2014-02-24 20:35:12 -08:00
..
driver.go	Use the cpu cgroup subsystem instead of memory because its non optional	2014-02-24 13:42:13 -08:00
init.go	Cleanup some statements from exec driver work	2014-02-14 17:28:50 -08:00
lxc_init_linux.go
lxc_init_unsupported.go
lxc_template.go
lxc_template_unit_test.go
term.go	Refactor driver to use Exec function from nsini	2014-02-22 01:21:26 -08:00