From b6a6c56915b836cf9579e3148c7d0b4f72722f06 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Wed, 17 Jun 2015 17:00:48 +0200 Subject: [PATCH] Remove missed code path for api < 1.12 Signed-off-by: Antonio Murdaca --- api/server/server.go | 1 - daemon/attach.go | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/api/server/server.go b/api/server/server.go index 46210cc7f4..fe7810e997 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -1124,7 +1124,6 @@ func (s *Server) postContainersAttach(version version.Version, w http.ResponseWr UseStderr: boolValue(r, "stderr"), Logs: boolValue(r, "logs"), Stream: boolValue(r, "stream"), - Multiplex: version.GreaterThanOrEqualTo("1.6"), } if err := s.daemon.ContainerAttachWithLogs(vars["name"], attachWithLogsConfig); err != nil { diff --git a/daemon/attach.go b/daemon/attach.go index 5193cf101d..8d8205f692 100644 --- a/daemon/attach.go +++ b/daemon/attach.go @@ -11,7 +11,6 @@ type ContainerAttachWithLogsConfig struct { OutStream io.Writer UseStdin, UseStdout, UseStderr bool Logs, Stream bool - Multiplex bool } func (daemon *Daemon) ContainerAttachWithLogs(name string, c *ContainerAttachWithLogsConfig) error { @@ -22,7 +21,7 @@ func (daemon *Daemon) ContainerAttachWithLogs(name string, c *ContainerAttachWit var errStream io.Writer - if !container.Config.Tty && c.Multiplex { + if !container.Config.Tty { errStream = stdcopy.NewStdWriter(c.OutStream, stdcopy.Stderr) c.OutStream = stdcopy.NewStdWriter(c.OutStream, stdcopy.Stdout) } else {