summaryrefslogtreecommitdiff
path: root/libpod/container_easyjson.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-08-23 13:07:28 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-24 19:19:43 +0000
commit347e934736c56143aaaa5da84406bb590550ce69 (patch)
tree9c383bb049587bb8a1f0262e6699c484e637adb7 /libpod/container_easyjson.go
parent20a625ba776aee115b872d092a61313fbc8240be (diff)
downloadpodman-347e934736c56143aaaa5da84406bb590550ce69.tar.gz
podman-347e934736c56143aaaa5da84406bb590550ce69.tar.bz2
podman-347e934736c56143aaaa5da84406bb590550ce69.zip
Regenerate easyjson after rebase
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1322 Approved by: mheon
Diffstat (limited to 'libpod/container_easyjson.go')
-rw-r--r--libpod/container_easyjson.go18
1 files changed, 16 insertions, 2 deletions
diff --git a/libpod/container_easyjson.go b/libpod/container_easyjson.go
index d4294e9b5..06521daab 100644
--- a/libpod/container_easyjson.go
+++ b/libpod/container_easyjson.go
@@ -95,7 +95,9 @@ func easyjson1dbef17bDecodeGithubComContainersLibpodLibpod(in *jlexer.Lexer, out
if v1 == nil {
v1 = new(ExecSession)
}
- (*v1).UnmarshalEasyJSON(in)
+ if data := in.Raw(); in.Ok() {
+ in.AddError((*v1).UnmarshalJSON(data))
+ }
}
(out.ExecSessions)[key] = v1
in.WantComma()
@@ -362,7 +364,7 @@ func easyjson1dbef17bEncodeGithubComContainersLibpodLibpod(out *jwriter.Writer,
if v6Value == nil {
out.RawString("null")
} else {
- (*v6Value).MarshalEasyJSON(out)
+ out.Raw((*v6Value).MarshalJSON())
}
}
out.RawByte('}')
@@ -1672,6 +1674,8 @@ func easyjson1dbef17bDecodeGithubComContainersLibpodLibpod2(in *jlexer.Lexer, ou
}
in.Delim(']')
}
+ case "pause":
+ out.IsInfra = bool(in.Bool())
default:
in.SkipRecursive()
}
@@ -2314,6 +2318,16 @@ func easyjson1dbef17bEncodeGithubComContainersLibpodLibpod2(out *jwriter.Writer,
out.RawByte(']')
}
}
+ {
+ const prefix string = ",\"pause\":"
+ if first {
+ first = false
+ out.RawString(prefix[1:])
+ } else {
+ out.RawString(prefix)
+ }
+ out.Bool(bool(in.IsInfra))
+ }
out.RawByte('}')
}