Merge pull request #8407 from mfojtik/double-timestamps

Disable 'Timestamps' in Docker logs to prevent double-timestamps

Merge pull request #8407 from mfojtik/double-timestamps
4a47e89e · Clayton Coleman · 47530211 · 7d11e226 · 4a47e89e
Commit 4a47e89e authored May 18, 2015 by Clayton Coleman
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

manager.go pkg/kubelet/dockertools/manager.go +1 -1

No files found.
--- a/pkg/kubelet/dockertools/manager.go
+++ b/pkg/kubelet/dockertools/manager.go
@@ -220,7 +220,7 @@ func (dm *DockerManager) GetContainerLogs(pod *api.Pod, containerID, tail string
 		Stderr:       true,
 		OutputStream: stdout,
 		ErrorStream:  stderr,
-		Timestamps:   true,
+		Timestamps:   false,
 		RawTerminal:  false,
 		Follow:       follow,
 	}