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 /cmd | |
| 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 'cmd')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 2 | ||||
| -rw-r--r-- | cmd/podman/containers/pause.go | 2 | ||||
| -rw-r--r-- | cmd/podman/containers/unpause.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index abb55f8c7..7d6471fd4 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" + "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" "github.com/containers/podman/v3/cmd/podman/registry" "github.com/containers/podman/v3/libpod/network/types" "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/domain/entities" "github.com/containers/podman/v3/pkg/rootless" "github.com/containers/podman/v3/pkg/specgen" diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go index 8e1b69d71..1e37bab55 100644 --- a/cmd/podman/containers/pause.go +++ b/cmd/podman/containers/pause.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v3/cmd/podman/common" "github.com/containers/podman/v3/cmd/podman/registry" "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/domain/entities" "github.com/containers/podman/v3/pkg/rootless" "github.com/pkg/errors" diff --git a/cmd/podman/containers/unpause.go b/cmd/podman/containers/unpause.go index e152f70e1..cf37b6369 100644 --- a/cmd/podman/containers/unpause.go +++ b/cmd/podman/containers/unpause.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v3/cmd/podman/common" "github.com/containers/podman/v3/cmd/podman/registry" "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/domain/entities" "github.com/containers/podman/v3/pkg/rootless" "github.com/pkg/errors" |