clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-07 22:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix line delimited JSON response"

Browse Source 
This reverts commit d2f75a3040.

Conflicts:
	integration-cli/docker_api_events_test.go

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
This commit is contained in:
Jessica Frazelle
2014-10-09 13:46:21 -07:00
parent 4c6b7cd1b5
commit b66ac6a809
4 changed files with 1 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client/utils.go
+1 -1
View File
@@ -168,7 +168,7 @@ func (cli *DockerCli) streamHelper(method, path string, setRawTerminal bool, in
}
if api.MatchesContentType(resp.Header.Get("Content-Type"), "application/json") {
return utils.DisplayJSONMessagesStream(resp.Body, stdout, cli.terminalFd, cli.isTerminal)
return utils.DisplayJSONMessagesStream(resp.Body, stdout, cli.outFd, cli.isTerminalOut)
}
if stdout != nil || stderr != nil {
// When TTY is ON, use regular copy