diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-13 18:06:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 18:06:54 +0100 |
| commit | eeb76db0fd0dc2a1115c2f2ad12c82eadbc62509 (patch) | |
| tree | 4666b0a66a98bd3f29586b3d3ac2c3028bd7443a /libpod/networking_linux.go | |
| parent | ab7228b3c27719e447de4dffe9b3fd7f67d6f346 (diff) | |
| parent | ece768ff9e7d2b0166c0b1850467a489556b93fc (diff) | |
| download | podman-eeb76db0fd0dc2a1115c2f2ad12c82eadbc62509.tar.gz podman-eeb76db0fd0dc2a1115c2f2ad12c82eadbc62509.tar.bz2 podman-eeb76db0fd0dc2a1115c2f2ad12c82eadbc62509.zip | |
Merge pull request #12642 from Luap99/libnetwork
use libnetwork from c/common
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index a931774f8..e98e143a6 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -19,12 +19,12 @@ import ( "time" "github.com/containernetworking/plugins/pkg/ns" + "github.com/containers/common/libnetwork/types" + "github.com/containers/common/pkg/netns" "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/libpod/network/types" "github.com/containers/podman/v3/pkg/errorhandling" "github.com/containers/podman/v3/pkg/namespaces" - "github.com/containers/podman/v3/pkg/netns" "github.com/containers/podman/v3/pkg/resolvconf" "github.com/containers/podman/v3/pkg/rootless" "github.com/containers/podman/v3/pkg/util" |