Guillaume J. Charmes 1ea14534fa Merge branch 'master' into load-profile ...

Conflicts:
	daemon/execdriver/native/create.go
	daemon/execdriver/native/driver.go

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 813cebc64fb4b628e2938405d86144060c330eb9
Component: engine

2014-04-21 10:32:13 -07:00

..

execdrivers

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

lxc

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

native

Merge branch 'master' into load-profile

2014-04-21 10:32:13 -07:00

driver.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

MAINTAINERS

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

pipes.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

termconsole.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00