diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-01-07 14:20:04 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-01-07 14:37:51 -0500 |
| commit | 5ed23327a9e68219f6d1eaf38e0533e732438eb5 (patch) | |
| tree | 58e80f2f5cf336d5010d77b3071940a5145bca84 /cmd/podman/shared/container.go | |
| parent | 148b4920dc9d866ce60654498af6e6bbc1d72f09 (diff) | |
| download | podman-5ed23327a9e68219f6d1eaf38e0533e732438eb5.tar.gz podman-5ed23327a9e68219f6d1eaf38e0533e732438eb5.tar.bz2 podman-5ed23327a9e68219f6d1eaf38e0533e732438eb5.zip | |
Rename libpod.Config back to ContainerConfig
During an earlier bugfix, we swapped all instances of
ContainerConfig to Config, which was meant to fix some data we
were returning from Inspect. This unfortunately also renamed a
libpod internal struct for container configs. Undo the rename
here.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'cmd/podman/shared/container.go')
| -rw-r--r-- | cmd/podman/shared/container.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go index 6c7d8eb52..a904ef75a 100644 --- a/cmd/podman/shared/container.go +++ b/cmd/podman/shared/container.go @@ -52,7 +52,7 @@ type PsOptions struct { // BatchContainerStruct is the return obkect from BatchContainer and contains // container related information type BatchContainerStruct struct { - ConConfig *libpod.Config + ConConfig *libpod.ContainerConfig ConState libpod.ContainerStatus ExitCode int32 Exited bool @@ -329,7 +329,7 @@ func PBatch(containers []*libpod.Container, workers int, opts PsOptions) []PsCon // locks. func BatchContainerOp(ctr *libpod.Container, opts PsOptions) (BatchContainerStruct, error) { var ( - conConfig *libpod.Config + conConfig *libpod.ContainerConfig conState libpod.ContainerStatus err error exitCode int32 |