diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-27 20:55:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 20:55:48 +0100 |
| commit | 3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2 (patch) | |
| tree | d085118d9cf28ed6a8a7b40c1bd6bb5b772b10cc /libpod/util.go | |
| parent | 1fe2fbb42114b9072a1caf359beff63042df90fd (diff) | |
| parent | 4352d585490f6c1eb7234ef4f92e0157083d69b3 (diff) | |
| download | podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.tar.gz podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.tar.bz2 podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.zip | |
Merge pull request #4698 from rhatdan/containers.conf
Add support for containers.conf
Diffstat (limited to 'libpod/util.go')
| -rw-r--r-- | libpod/util.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/util.go b/libpod/util.go index f79d6c09b..e9d234bbe 100644 --- a/libpod/util.go +++ b/libpod/util.go @@ -12,7 +12,8 @@ import ( "strings" "time" - "github.com/containers/libpod/libpod/config" + "github.com/containers/common/pkg/config" + "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/utils" "github.com/fsnotify/fsnotify" |