upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-05-28 04:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #22447 from yifan-gu/fix_log

Browse source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-04 08:01:51 -08:00
commit 077fff8f4a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/kubelet/rkt/log.go
View file

@ -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)
}