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/runtime.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/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 1a22cd09a..9794b3605 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -19,6 +19,7 @@ import ( "github.com/containers/buildah/pkg/parse" "github.com/containers/common/libimage" + "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/pkg/sysregistriesv2" @@ -32,7 +33,6 @@ import ( nettypes "github.com/containers/podman/v3/libpod/network/types" "github.com/containers/podman/v3/libpod/plugin" "github.com/containers/podman/v3/libpod/shutdown" - "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/rootless" "github.com/containers/podman/v3/pkg/systemd" "github.com/containers/podman/v3/pkg/util" |