diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-03 14:48:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 14:48:10 +0100 |
| commit | 3bc5f431d4df9724501a42a68e333f7e98a0b0cf (patch) | |
| tree | 1f17afda2b289133dc4feaec4d8fb495c43372f2 /pkg/specgen/namespaces.go | |
| parent | 34baea814ba6af58e7f7b65622fd0fb7b838fbf7 (diff) | |
| parent | f678b3fcf13d78cf45ea4fdb7f9f0937773b8371 (diff) | |
| download | podman-3bc5f431d4df9724501a42a68e333f7e98a0b0cf.tar.gz podman-3bc5f431d4df9724501a42a68e333f7e98a0b0cf.tar.bz2 podman-3bc5f431d4df9724501a42a68e333f7e98a0b0cf.zip | |
Merge pull request #5206 from rhatdan/capabilities
Allow devs to set labels in container images for default capabilities.
Diffstat (limited to 'pkg/specgen/namespaces.go')
| -rw-r--r-- | pkg/specgen/namespaces.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go index 17b180cde..79a83819a 100644 --- a/pkg/specgen/namespaces.go +++ b/pkg/specgen/namespaces.go @@ -3,9 +3,9 @@ package specgen import ( "os" + "github.com/containers/common/pkg/capabilities" "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/image" - "github.com/containers/libpod/pkg/capabilities" "github.com/cri-o/ocicni/pkg/ocicni" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" |