Michael Crosby eab56ac007 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)		2014-03-27 08:00:18 +00:00
..
execdriver	Merge branch 'master' into pluginflag	2014-03-27 08:00:18 +00:00
graphdriver	Merge pull request #4838 from crosbymichael/btrfs-ftw	2014-03-27 19:55:25 +02:00
networkdriver	Return error when existing bridge does not match ip	2014-03-26 11:51:27 +00:00
container.go	Add --opt arguments for drivers	2014-03-27 21:47:47 +01:00
container_unit_test.go	Move runtime and container into sub pkg	2014-03-09 23:03:40 -07:00
runtime.go	This patch adds SELinux labeling support.	2014-03-26 15:30:40 -04:00
runtime_aufs.go	graphdriver: build tags	2014-03-17 21:54:05 -04:00
runtime_btrfs.go	btrfs: build tags	2014-03-18 13:44:23 -04:00
runtime_devicemapper.go	graphdriver: build tags	2014-03-17 21:54:05 -04:00
runtime_no_aufs.go	graphdriver: build tags	2014-03-17 21:54:05 -04:00
server.go	Add IsRunning to server interface	2014-03-09 23:16:15 -07:00
sorter.go	Move runtime and container into sub pkg	2014-03-09 23:03:40 -07:00
state.go	Fix since time exit display when s.FinishedAt is zero	2014-03-21 15:28:02 +09:00
utils.go	Add --opt arguments for drivers	2014-03-27 21:47:47 +01:00
utils_test.go	Add unit test for lxc conf merge and native opts	2014-03-24 07:16:40 +00:00
volumes.go	Move execdrivers into runtime top level pkg	2014-03-17 11:40:12 -07:00