diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-13 18:12:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 18:12:40 +0200 |
| commit | 031280cfe4ea1f96967539b22bb24515395e6f29 (patch) | |
| tree | 8f63e4a35f291e73c1e2d26bd9e2f58a0e067a23 /libpod/container.go | |
| parent | f628a97be5b142878ab624776505aed315607f12 (diff) | |
| parent | 7b7853d8c789cd452ecca86ec28ef2c2dace570d (diff) | |
| download | podman-031280cfe4ea1f96967539b22bb24515395e6f29.tar.gz podman-031280cfe4ea1f96967539b22bb24515395e6f29.tar.bz2 podman-031280cfe4ea1f96967539b22bb24515395e6f29.zip | |
Merge pull request #3319 from mheon/purge_easyjson
Purge all use of easyjson and ffjson in libpod
Diffstat (limited to 'libpod/container.go')
| -rw-r--r-- | libpod/container.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libpod/container.go b/libpod/container.go index c8ab42fc3..68c4cd6b0 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -135,7 +135,6 @@ const ( // assume that their callers handled this requirement. Generally speaking, if a // function takes the container lock and accesses any part of state, it should // syncContainer() immediately after locking. -// ffjson: skip type Container struct { config *ContainerConfig @@ -161,7 +160,6 @@ type Container struct { // ContainerState contains the current state of the container // It is stored on disk in a tmpfs and recreated on reboot -// easyjson:json type ContainerState struct { // The current state of the running container State ContainerStatus `json:"state"` @@ -222,7 +220,6 @@ type ContainerState struct { } // ExecSession contains information on an active exec session -// easyjson:json type ExecSession struct { ID string `json:"id"` Command []string `json:"command"` @@ -232,7 +229,6 @@ type ExecSession struct { // ContainerConfig contains all information that was used to create the // container. It may not be changed once created. // It is stored, read-only, on disk -// easyjson:json type ContainerConfig struct { Spec *spec.Spec `json:"spec"` ID string `json:"id"` |