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

This commit is contained in:
Solomon Hykes
2013-05-28 19:39:20 -07:00
4 changed files with 15 additions and 10 deletions
+2 -2
View File
@@ -24,7 +24,7 @@ Docker Remote API
List containers
***************
.. http:get:: /containers/ps
.. http:get:: /containers/json
List containers
@@ -32,7 +32,7 @@ List containers
.. sourcecode:: http
GET /containers/ps?all=1&before=8dfafdbc3a40 HTTP/1.1
GET /containers/json?all=1&before=8dfafdbc3a40 HTTP/1.1
**Example response**: