docker-cli

Files

Michael Crosby f4111a1ccb Merge branch 'master' into pluginflag

Conflicts:
	pkg/cgroups/cgroups.go
	pkg/libcontainer/nsinit/exec.go
	pkg/libcontainer/nsinit/init.go
	pkg/libcontainer/nsinit/mount.go
	runconfig/hostconfig.go
	runconfig/parse.go
	runtime/execdriver/driver.go
	runtime/execdriver/lxc/lxc_template.go
	runtime/execdriver/lxc/lxc_template_unit_test.go
	runtime/execdriver/native/default_template.go
	runtime/execdriver/native/driver.go

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

2014-03-27 08:00:18 +00:00

nsinit

libcontainer: remove duplicate imports

2014-03-18 16:25:26 -07:00

command.go

Add ability to work with individual namespaces

2014-03-21 00:23:34 +00:00

exec.go

Merge branch 'master' into pluginflag

2014-03-27 08:00:18 +00:00

execin.go

This patch adds SELinux labeling support.