opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-18 15:54:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

update dependencies

Browse Source 
Ran a `go get -u` and bumped K8s deps to 1.15.0.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2019-06-24 21:29:31 +02:00
parent a1a4a75abe
commit 2388222e98
567 changed files with 60457 additions and 12463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vendor/github.com/json-iterator/go/reflect_marshaler.go generated vendored
View File

@ -93,8 +93,7 @@ func (encoder *marshalerEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
stream.WriteNil()
return
}
marshaler := obj.(json.Marshaler)
bytes, err := marshaler.MarshalJSON()
bytes, err := json.Marshal(obj)
if err != nil {
stream.Error = err
} else {