summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-01-08 07:06:09 -0800
committerGitHub <noreply@github.com>2019-01-08 07:06:09 -0800
commit9474b8cea239348d11c913b03b9461afaf663f0b (patch)
tree6bc89d8f2881c0eeb4df5d24b938c69008d8dce9 /cmd
parent4f19f1afcaa67f8e775e303b1b6627fb5abd9116 (diff)
parent5ed23327a9e68219f6d1eaf38e0533e732438eb5 (diff)
downloadpodman-9474b8cea239348d11c913b03b9461afaf663f0b.tar.gz
podman-9474b8cea239348d11c913b03b9461afaf663f0b.tar.bz2
podman-9474b8cea239348d11c913b03b9461afaf663f0b.zip
Merge pull request #2099 from mheon/config_to_containerconfig
Rename libpod.Config back to ContainerConfig
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/shared/container.go4
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