clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 13:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature

Browse Source 
* API: rename containers/ps to containers/json
This commit is contained in:
Guillaume J. Charmes
2013-05-28 15:44:20 -07:00
parent 7aa0d11171 4f9443927e
commit f65327555e
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api.go
+3 -2
View File
@@ -206,7 +206,7 @@ func getContainersChanges(srv *Server, version float64, w http.ResponseWriter, r
return nil
}
func getContainersPs(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
func getContainersJson(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
if err := parseForm(r); err != nil {
return err
}
@@ -631,7 +631,8 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {
"/images/search": getImagesSearch,
"/images/{name:.*}/history": getImagesHistory,
"/images/{name:.*}/json": getImagesByName,
"/containers/ps": getContainersPs,
"/containers/ps": getContainersJson,
"/containers/json": getContainersJson,
"/containers/{name:.*}/export": getContainersExport,
"/containers/{name:.*}/changes": getContainersChanges,
"/containers/{name:.*}/json": getContainersByName,