Merge branch 'master' into vieux_merge_master
This commit is contained in:
commit
880a0e9c36
1 changed files with 0 additions and 3 deletions
3
api.go
3
api.go
|
@ -647,9 +647,6 @@ func postContainersStart(srv *Server, version float64, w http.ResponseWriter, r
|
|||
}
|
||||
name := vars["name"]
|
||||
job := srv.Eng.Job("start", name)
|
||||
if err := job.ImportEnv(HostConfig{}); err != nil {
|
||||
return fmt.Errorf("Couldn't initialize host configuration")
|
||||
}
|
||||
// allow a nil body for backwards compatibility
|
||||
if r.Body != nil {
|
||||
if matchesContentType(r.Header.Get("Content-Type"), "application/json") {
|
||||
|
|
Loading…
Add table
Reference in a new issue