Commit Graph

9 Commits

Author SHA1 Message Date
bb5d485b62 Merged branch 79-rmi_regexp-feature
Upstream-commit: bb5b7897a419ce49ce4600bcc24ec28d1af8c923
Component: engine
2013-03-15 14:08:02 -07:00
60f8e4260a Add entries to the gitignore
Upstream-commit: 4d80958b016b8055c166393cb5e0e69f7a30441e
Component: engine
2013-03-15 01:28:09 -07:00
4086a22f6e Moved debian-specific files to ./deb, minor fixes to Makefile
Upstream-commit: 0b5e223b4e7d38a6511424d24c8cc12ec9c021de
Component: engine
2013-03-13 21:22:30 -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
8990ed16c8 Add *.orig to .gitignore
Upstream-commit: 6908628b555a1583f079f04ed34f5d81ce917459
Component: engine
2013-03-12 08:06:22 -07:00
b9049f5277 Changed .gitignore to not match docker/*.go
Upstream-commit: 278aa5f045ad6dd8718933b4736c29567a17717a
Component: engine
2013-02-26 17:29:11 -08:00
1b8770e955 ignore .vagrant
Upstream-commit: ac15003c05a844aa08e591ff7675ff6a406f188b
Component: engine
2013-02-23 13:59:06 -07:00
cb554356a9 ignore produced binaries
Upstream-commit: 7e5dfc51ade66d75c1429a05334b500d1cb8db20
Component: engine
2013-02-19 20:49:06 -07:00
f86f39ff84 .gitignore
Upstream-commit: ffc8d1e7b97bd9fce380f310e18dcd1402c7c9ac
Component: engine
2013-02-13 16:38:50 -08:00