diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-07 12:49:57 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-07 12:49:57 +0000 |
commit | 23ce826a84db81b834ef62584b6d3ffb3e0084fd (patch) | |
tree | d647ba1e6650f0a30656a8022acc74d5dea9323d /libpod/info.go | |
parent | 43077291ac8cafeea5b75ccbb37d929b079bf235 (diff) | |
parent | 2130d185395b897798dcb1c17bbaf147dfb4da3c (diff) | |
download | podman-23ce826a84db81b834ef62584b6d3ffb3e0084fd.tar.gz podman-23ce826a84db81b834ef62584b6d3ffb3e0084fd.tar.bz2 podman-23ce826a84db81b834ef62584b6d3ffb3e0084fd.zip |
Merge pull request #12498 from rhatdan/cgroups
Update vendor or containers/common moving pkg/cgroups there
Diffstat (limited to 'libpod/info.go')
-rw-r--r-- | libpod/info.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/info.go b/libpod/info.go index a1db5763a..354364ccc 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -14,11 +14,11 @@ import ( "github.com/containers/buildah" "github.com/containers/common/pkg/apparmor" + "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/seccomp" "github.com/containers/image/v5/pkg/sysregistriesv2" "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/linkmode" - "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/rootless" "github.com/containers/storage" "github.com/containers/storage/pkg/system" |