Commit Graph

5 Commits

Author SHA1 Message Date
fe4868dfd9 Fix merge issue
Upstream-commit: b438565609917439cb4172717e5505c265c4e291
Component: engine
2013-05-24 14:48:13 -07:00
c479ea1a4b Finish resize implementation client and server
Upstream-commit: 88ef309a940bcbb6f85a750372b8fdbc6569c3a7
Component: engine
2013-05-24 14:44:16 -07:00
bc6fad489c Create a subpackage for utils
Upstream-commit: 2e69e1727b4d5698a90c24c5800eecd5401dc319
Component: engine
2013-05-14 22:37:35 +00:00
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