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 /utils | |
| 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 'utils')
| -rw-r--r-- | utils/utils.go | 2 | ||||
| -rw-r--r-- | utils/utils_supported.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/utils.go b/utils/utils.go index 80eed7536..095370a08 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -12,8 +12,8 @@ import ( "strings" "sync" + "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/storage/pkg/archive" "github.com/godbus/dbus/v5" "github.com/pkg/errors" diff --git a/utils/utils_supported.go b/utils/utils_supported.go index 0f0c9a9ba..be200509b 100644 --- a/utils/utils_supported.go +++ b/utils/utils_supported.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v3/pkg/cgroups" + "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v3/pkg/rootless" systemdDbus "github.com/coreos/go-systemd/v22/dbus" "github.com/godbus/dbus/v5" |