github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 04:32:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5416 from smarterclayton/use_utc_serialized_and_local_otherwise

Browse Source 
Use UTC when marshalling times and Local when unmarshalling
This commit is contained in:
Satnam Singh
2015-03-20 08:32:26 -07:00
parent 8fe47aa2b9 d516a86633
commit ec77230386
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/util/time.go
View File

@@ -86,7 +86,7 @@ func (t *Time) UnmarshalJSON(b []byte) error {
return err
}
t.Time = pt
t.Time = pt.Local()
return nil
}
@@ -97,7 +97,7 @@ func (t Time) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
}
return json.Marshal(t.Format(time.RFC3339))
return json.Marshal(t.UTC().Format(time.RFC3339))
}
// Fuzz satisfies fuzz.Interface.