6 commits

Author	SHA1	Message	Date
Solomon Hykes	8f81feb1f0	Merge branch 'pull-missing' of ssh://github.com/chooper/docker	2013-03-13 13:50:47 -07:00
Solomon Hykes	ce20fbfff6	Improved output of 'docker inspect'	2013-03-13 13:48:00 -07:00
Solomon Hykes	f5f26a510f	'docker inspect' supports pinned versions again (eg. 'docker inspect PATH:revision')	2013-03-13 13:23:59 -07:00
Charles Hooper	8c2ff9374c	Merge branch 'master' into pull-missing	2013-03-13 19:51:08 +00:00
Solomon Hykes	89245360e8	Merged branch 28-standalone	2013-03-13 12:23:37 -07:00
Solomon Hykes	745edc49cd	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