bump to master

This commit is contained in:
Victor Vieux
2013-05-29 13:52:18 +00:00
32 changed files with 833 additions and 271 deletions
+1
View File
@@ -0,0 +1 @@
Solomon Hykes <solomon@dotcloud.com>
+3 -3
View File
@@ -31,7 +31,7 @@ You can still call an old version of the api using /v1.0/images/<name>/insert
List containers
***************
.. http:get:: /containers/ps
.. http:get:: /containers/json
List containers
@@ -39,7 +39,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**:
@@ -385,7 +385,7 @@ Attach to a container
.. http:post:: /containers/(id)/attach
Stop the container ``id``
Attach to the container ``id``
**Example request**: