Move networking drivers into runtime top level pkg

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2230c9b9a735d731cc2fee4137633eb98b9da9d5
Component: engine
This commit is contained in:
Michael Crosby
2014-03-17 11:40:12 -07:00
parent 063cfadb64
commit 4b7a6e2613
13 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/api"
"github.com/dotcloud/docker/networkdriver/lxc"
"github.com/dotcloud/docker/runtime/networkdriver/lxc"
"github.com/dotcloud/docker/server"
)
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"net"
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/networkdriver"
"github.com/dotcloud/docker/runtime/networkdriver"
)
const (
@@ -3,7 +3,7 @@ package ipallocator
import (
"encoding/binary"
"errors"
"github.com/dotcloud/docker/networkdriver"
"github.com/dotcloud/docker/runtime/networkdriver"
"github.com/dotcloud/docker/pkg/collections"
"net"
"sync"
@@ -3,10 +3,10 @@ package lxc
import (
"fmt"
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/networkdriver"
"github.com/dotcloud/docker/networkdriver/ipallocator"
"github.com/dotcloud/docker/networkdriver/portallocator"
"github.com/dotcloud/docker/networkdriver/portmapper"
"github.com/dotcloud/docker/runtime/networkdriver"
"github.com/dotcloud/docker/runtime/networkdriver/ipallocator"
"github.com/dotcloud/docker/runtime/networkdriver/portallocator"
"github.com/dotcloud/docker/runtime/networkdriver/portmapper"
"github.com/dotcloud/docker/pkg/iptables"
"github.com/dotcloud/docker/pkg/netlink"
"github.com/dotcloud/docker/utils"
+2 -2
View File
@@ -17,8 +17,8 @@ import (
_ "github.com/dotcloud/docker/graphdriver/devmapper"
_ "github.com/dotcloud/docker/graphdriver/vfs"
"github.com/dotcloud/docker/image"
_ "github.com/dotcloud/docker/networkdriver/lxc"
"github.com/dotcloud/docker/networkdriver/portallocator"
_ "github.com/dotcloud/docker/runtime/networkdriver/lxc"
"github.com/dotcloud/docker/runtime/networkdriver/portallocator"
"github.com/dotcloud/docker/pkg/graphdb"
"github.com/dotcloud/docker/pkg/sysinfo"
"github.com/dotcloud/docker/runconfig"