Merge pull request #164 from aboch/pg

Remove pkg directory

libnetwork/api/api_test.go

@@ -13,9 +13,9 @@ import (
 
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/libnetwork"
+	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/netlabel"
-	"github.com/docker/libnetwork/pkg/options"
+	"github.com/docker/libnetwork/options"
 )
 
 const (

libnetwork/cmd/readme_test/readme.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/docker/libnetwork"
+	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/netlabel"
-	"github.com/docker/libnetwork/pkg/options"
+	"github.com/docker/libnetwork/options"
 )
 
 func main() {

libnetwork/cmd/test/main.go

@@ -6,7 +6,7 @@ import (
 	"net"
 
 	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/pkg/options"
+	"github.com/docker/libnetwork/options"
 )
 
 func main() {

libnetwork/drivers/bridge/bridge.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/docker/libnetwork/driverapi"
 	"github.com/docker/libnetwork/ipallocator"
+	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/netlabel"
-	"github.com/docker/libnetwork/pkg/options"
+	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/portmapper"
 	"github.com/docker/libnetwork/sandbox"
 	"github.com/docker/libnetwork/types"

libnetwork/drivers/bridge/bridge_test.go

@@ -7,9 +7,9 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/docker/libnetwork/iptables"
+	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/iptables"
-	"github.com/docker/libnetwork/pkg/netlabel"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/drivers/bridge/link.go

@@ -5,8 +5,8 @@ import (
 	"net"
 
 	log "github.com/Sirupsen/logrus"
+	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/iptables"
 )
 
 type link struct {

libnetwork/drivers/bridge/network_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/netlabel"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/drivers/bridge/port_mapping_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/reexec"
+	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/netlabel"
 )
 
 func TestMain(m *testing.M) {

libnetwork/drivers/bridge/setup_ip_tables.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/iptables"
 )
 
 // DockerChain: DOCKER iptable chain name

libnetwork/drivers/bridge/setup_ip_tables_test.go

@@ -4,8 +4,8 @@ import (
 	"net"
 	"testing"
 
+	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/iptables"
 )
 
 const (

libnetwork/endpoint.go

@@ -11,10 +11,10 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/libnetwork/etchosts"
+	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/etchosts"
-	"github.com/docker/libnetwork/pkg/netlabel"
-	"github.com/docker/libnetwork/pkg/resolvconf"
+	"github.com/docker/libnetwork/resolvconf"
 	"github.com/docker/libnetwork/sandbox"
 	"github.com/docker/libnetwork/types"
 )

libnetwork/libnetwork_test.go

@@ -15,9 +15,9 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/docker/libnetwork"
+	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/netlabel"
-	"github.com/docker/libnetwork/pkg/options"
+	"github.com/docker/libnetwork/options"
 	"github.com/vishvananda/netns"
 )
 

libnetwork/network.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/pkg/netlabel"
-	"github.com/docker/libnetwork/pkg/options"
+	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/types"
 )
 

libnetwork/portmapper/mapper.go

@@ -7,8 +7,8 @@ import (
 	"sync"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/libnetwork/pkg/iptables"
-	"github.com/docker/libnetwork/pkg/portallocator"
+	"github.com/docker/libnetwork/iptables"
+	"github.com/docker/libnetwork/portallocator"
 )
 
 type mapping struct {

libnetwork/portmapper/mapper_test.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/docker/docker/pkg/reexec"
+	"github.com/docker/libnetwork/iptables"
 	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/pkg/iptables"
 )
 
 func TestMain(m *testing.M) {

libnetwork/resolvconf/resolvconf.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/libnetwork/pkg/resolvconf/dns"
+	"github.com/docker/libnetwork/resolvconf/dns"
 )
 
 var (