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 |
|
Michael Crosby
|
eceeebc22d
|
Remove IsGhost checks around networking
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
|
2014-04-17 23:49:59 +00:00 |
|
Alexander Larsson
|
359b7df5d2
|
Rename runtime/* to daemon/*
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
|
2014-04-17 14:43:01 -07:00 |