Merge pull request #8407 from mfojtik/double-timestamps

Disable 'Timestamps' in Docker logs to prevent double-timestamps
2015-05-18 09:59:50 -04:00
parent 4753021167 7d11e226b7
commit 4a47e89e8a
1 changed files with 1 additions and 1 deletions
--- 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,
 	}