Merge pull request #3329 from shykes/pkg-netlink

Move utility package 'netlink' to pkg/netlink
This commit is contained in:
Victor Vieux
2013-12-23 16:08:07 -08:00
4 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"