2 Commits

Author	SHA1	Message	Date
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
Alexander Larsson	f7be50364d	Rename runtime/* to daemon/* ... Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson) Upstream-commit: 359b7df5d2af5733b8a1ea6746d062053053b23e Component: engine	2014-04-17 14:43:01 -07:00