Merge pull request #3464 from vieux/fix_error_wait

fix error on docker wait
Upstream-commit: 1d0d093d0b24ab3119a3b727f3c6aeffcf82a9bf
Component: engine

components/engine/commands.go

@@ -2510,11 +2510,7 @@ func (cli *DockerCli) LoadConfigFile() (err error) {
 func waitForExit(cli *DockerCli, containerId string) (int, error) {
 	body, _, err := cli.call("POST", "/containers/"+containerId+"/wait", nil)
 	if err != nil {
-		// If we can't connect, then the daemon probably died.
-		if err != ErrConnectionRefused {
-			return -1, err
-		}
-		return -1, nil
+		return -1, err
 	}
 
 	var out APIWait