From e7204ea88ebbdcd6c4a731723c53067caf161e6d Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Mon, 23 Dec 2013 23:39:39 +0000 Subject: [PATCH] Move utility package 'netlink' to pkg/netlink Upstream-commit: f6b91262a77b2e70da8572850dd8b56d92384dfe Component: engine --- components/engine/network.go | 2 +- components/engine/{ => pkg}/netlink/netlink_darwin.go | 0 components/engine/{ => pkg}/netlink/netlink_linux.go | 0 components/engine/sysinit/sysinit.go | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename components/engine/{ => pkg}/netlink/netlink_darwin.go (100%) rename components/engine/{ => pkg}/netlink/netlink_linux.go (100%) diff --git a/components/engine/network.go b/components/engine/network.go index 9cb6231855..5ee5c4bee8 100644 --- a/components/engine/network.go +++ b/components/engine/network.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "github.com/dotcloud/docker/iptables" - "github.com/dotcloud/docker/netlink" + "github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/proxy" "github.com/dotcloud/docker/utils" "log" diff --git a/components/engine/netlink/netlink_darwin.go b/components/engine/pkg/netlink/netlink_darwin.go similarity index 100% rename from components/engine/netlink/netlink_darwin.go rename to components/engine/pkg/netlink/netlink_darwin.go diff --git a/components/engine/netlink/netlink_linux.go b/components/engine/pkg/netlink/netlink_linux.go similarity index 100% rename from components/engine/netlink/netlink_linux.go rename to components/engine/pkg/netlink/netlink_linux.go diff --git a/components/engine/sysinit/sysinit.go b/components/engine/sysinit/sysinit.go index 01c7473b5d..f906b7d2dd 100644 --- a/components/engine/sysinit/sysinit.go +++ b/components/engine/sysinit/sysinit.go @@ -4,7 +4,7 @@ import ( "encoding/json" "flag" "fmt" - "github.com/dotcloud/docker/netlink" + "github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/utils" "github.com/syndtr/gocapability/capability" "io/ioutil"