Merge pull request #22447 from yifan-gu/fix_log

Auto commit by PR queue bot

Merge pull request #22447 from yifan-gu/fix_log
077fff8f · k8s-merge-robot · 49f438bf · b7a058e2 · 077fff8f
Commit 077fff8f authored Mar 04, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

log.go pkg/kubelet/rkt/log.go +1 -1

No files found.
--- a/pkg/kubelet/rkt/log.go
+++ b/pkg/kubelet/rkt/log.go
@@ -76,7 +76,7 @@ func pipeLog(wg *sync.WaitGroup, logOptions *api.PodLogOptions, r io.ReadCloser,
 		var result string
 		if logOptions.Timestamps {
 			// Use the same time format as docker.
-			result = fmt.Sprintf("%s %s\n", t, msg)
+			result = fmt.Sprintf("%s %s\n", t.Format(time.RFC3339), msg)
 		} else {
 			result = fmt.Sprintf("%s\n", msg)
 		}