Guillaume J. Charmes 813cebc64f 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)		2014-04-21 10:32:13 -07:00
..
configuration	Rename runtime/* to daemon/*	2014-04-17 14:43:01 -07:00
template	Merge branch 'master' into load-profile	2014-04-21 10:32:13 -07:00
create.go	Merge branch 'master' into load-profile	2014-04-21 10:32:13 -07:00
driver.go	Merge branch 'master' into load-profile	2014-04-21 10:32:13 -07:00
info.go	Rename runtime/* to daemon/*	2014-04-17 14:43:01 -07:00
term.go	Rename runtime/* to daemon/*	2014-04-17 14:43:01 -07:00