summaryrefslogtreecommitdiff
path: root/libpod/networking.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-01-08 15:18:15 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-01-08 20:48:31 +0000
commitda7556de4ad1d89bd97e1f6c5a146eee00e8c040 (patch)
treeec384ffebaab42104b87fd7bffe12cb4104975bc /libpod/networking.go
parent21881679099491049db367504d09f9a48d3e5fa7 (diff)
downloadpodman-da7556de4ad1d89bd97e1f6c5a146eee00e8c040.tar.gz
podman-da7556de4ad1d89bd97e1f6c5a146eee00e8c040.tar.bz2
podman-da7556de4ad1d89bd97e1f6c5a146eee00e8c040.zip
Fix merge issues
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #189 Approved by: mheon
Diffstat (limited to 'libpod/networking.go')
-rw-r--r--libpod/networking.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/networking.go b/libpod/networking.go
index 1d61fbc6c..456830708 100644
--- a/libpod/networking.go
+++ b/libpod/networking.go
@@ -1,6 +1,8 @@
package libpod
import (
+ "net"
+
"github.com/containernetworking/plugins/pkg/ns"
"github.com/cri-o/ocicni/pkg/ocicni"
"github.com/pkg/errors"