Solomon Hykes 621d110d7f Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon ...

Upstream-commit: 745edc49cdcf0dc02fe714b0772f146fc8a66d23
Component: engine

2013-03-13 00:29:40 -07:00

..

docker.go

Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon

2013-03-13 00:29:40 -07:00