Commit Graph

2 Commits

Author SHA1 Message Date
90cf237eab Fixing newlines in attached mode
Upstream-commit: b00ff47963bb236d9f94fbcd759e4f3fba021d05
Component: engine
2013-03-22 04:24:03 -07:00
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