Merge pull request #3974 from creack/3967-add_content_type-fix

Add json content type to /containers/json api endpoint
This commit is contained in:
Michael Crosby 2014-02-06 14:18:00 -05:00
commit 22aeae34c1
1 changed files with 1 additions and 0 deletions

View File

@ -320,6 +320,7 @@ func getContainersJSON(eng *engine.Engine, version float64, w http.ResponseWrite
job.Setenv("limit", r.Form.Get("limit"))
if version >= 1.5 {
w.Header().Set("Content-Type", "application/json")
job.Stdout.Add(w)
} else if outs, err = job.Stdout.AddTable(); err != nil {
return err