Commit Graph

12 Commits

Author SHA1 Message Date
35529bba2c Put back the github.com path for the import
Upstream-commit: 453d49573c91a1c49ffbc54d040145804e38d91e
Component: engine
2013-03-12 11:59:27 -07:00
d6cad8aba4 Merge master within fs
Upstream-commit: 150a4fe7e5aaa5d733130e22eac09cb36ffadd82
Component: engine
2013-03-12 08:33:21 -07:00
ec87b553c7 Automatically remove the rcfile generated by docker -i from /tmp
Upstream-commit: b2de17bf2cfdf90f347109452bcb8763138cff46
Component: engine
2013-03-12 12:12:40 -07:00
b9140244d5 Put back the relative paths for dev purpose
Upstream-commit: 18f4e7e196eb894765094c1291e1a1f6599f4266
Component: engine
2013-03-12 05:17:51 -07:00
c28aedcbf3 Change relative paths to absolute
Upstream-commit: 687d6f25eeb8f4bc505dc9c6c0d9ea305c824e2d
Component: engine
2013-03-11 02:59:52 -07:00
3720d832c1 post-merge repairs
Upstream-commit: 5d6199b9251261216cb096cd919e3cc5eb3efdd6
Component: engine
2013-03-11 07:39:06 -07:00
d2bed9b75c go fmt
Upstream-commit: aa12da6f5076738955b30470639d439a0cbe40f9
Component: engine
2013-02-26 17:26:46 -08:00
27db035d5d Interactive mode preserves existing PATH, to facilitate scripting
Upstream-commit: db4c75f3c1cdbc654595bb3dda5455a93c1b56b4
Component: engine
2013-02-20 14:45:43 -08:00
bd1dc2a768 white space
Upstream-commit: e8d48641de6c5e866dc18708e2e260b7578c1d50
Component: engine
2013-02-20 12:23:47 +00:00
c032cffa1c make sure the standard "replace input carriage returns with line feeds" and "replace output line feeds with carriage return and line feed" flags are set, even on raw (I dont think it should actually be raw)
Upstream-commit: 3a59336f82e73150059c93398f283b8e15fdb4e9
Component: engine
2013-02-20 12:19:22 +00:00
92f2fe8ab7 'docker start' and 'docker restart': start or restart a container
Upstream-commit: d2885910bda77538eb31b86b10a3dd85ee2abadf
Component: engine
2013-02-14 13:49:05 -08:00
e924ec5591 Moved server and client logic into sub-packages docker/server and docker/client, respectively. The UI is not affected.
Upstream-commit: e1b25e9b084a2375640b811a27b75b89d57666d9
Component: engine
2013-02-13 17:10:00 -08:00