Browse Source

Merge pull request #3329 from shykes/pkg-netlink

Move utility package 'netlink' to pkg/netlink
Victor Vieux 11 years ago
parent
commit
0d207abf8e
4 changed files with 2 additions and 2 deletions
  1. 1 1
      network.go
  2. 0 0
      pkg/netlink/netlink_darwin.go
  3. 0 0
      pkg/netlink/netlink_linux.go
  4. 1 1
      sysinit/sysinit.go

+ 1 - 1
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"

+ 0 - 0
netlink/netlink_darwin.go → pkg/netlink/netlink_darwin.go


+ 0 - 0
netlink/netlink_linux.go → pkg/netlink/netlink_linux.go


+ 1 - 1
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"