Merge branch 'master' of ssh://github.com/dotcloud/docker

Upstream-commit: 2cf29893b3b1e6fc526bdf45734f942317598611
Component: engine
This commit is contained in:
Solomon Hykes
2013-05-23 09:33:34 -06:00
@@ -23,5 +23,5 @@
-t=false: Allocate a pseudo-tty
-u="": Username or UID
-d=[]: Set custom dns servers for the container
-v=[]: Creates a new volumes and mount it at the specified path.
-v=[]: Creates a new volume and mounts it at the specified path.
-volumes-from="": Mount all volumes from the given container.