Merge pull request #14297 from pwaller/move-nat-pkg

Move /nat to /pkg/nat
Upstream-commit: caa4acc7b11cbefb74d0b066d4a0752f4a11c5ee
Component: engine

components/engine/api/client/port.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/nat"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/docker/pkg/nat"
 )
 
 // CmdPort lists port mappings for a container.

components/engine/builder/dispatchers.go

@@ -18,8 +18,8 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/nat"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/runconfig"
 )
 

components/engine/daemon/container.go

@@ -21,12 +21,12 @@ import (
 	"github.com/docker/docker/daemon/logger/jsonfilelog"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/nat"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/broadcastwriter"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/jsonlog"
 	"github.com/docker/docker/pkg/mount"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/symlink"
 	"github.com/docker/docker/runconfig"

components/engine/daemon/container_linux.go

@@ -18,10 +18,10 @@ import (
 	"github.com/docker/docker/daemon/execdriver"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/links"
-	"github.com/docker/docker/nat"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/directory"
 	"github.com/docker/docker/pkg/ioutils"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/ulimit"
 	"github.com/docker/docker/runconfig"

components/engine/daemon/container_unit_test.go

@@ -1,7 +1,7 @@
 package daemon
 
 import (
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 	"testing"
 )
 

components/engine/daemon/list.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/nat"
 	"github.com/docker/docker/pkg/graphdb"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/pkg/parsers/filters"
 )
 

components/engine/daemon/network/settings.go

@@ -1,6 +1,6 @@
 package network
 
-import "github.com/docker/docker/nat"
+import "github.com/docker/docker/pkg/nat"
 
 type Address struct {
 	Addr      string

components/engine/integration-cli/docker_cli_create_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/go-check/check"
 )
 

components/engine/integration-cli/docker_cli_run_test.go

@@ -18,7 +18,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/libnetwork/resolvconf"
 	"github.com/go-check/check"
 )

components/engine/links/links.go

@@ -5,7 +5,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 )
 
 type Link struct {

components/engine/links/links_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 )
 
 func TestLinkNaming(t *testing.T) {

components/engine/runconfig/config.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 )
 
 // Entrypoint encapsulates the container entrypoint.

components/engine/runconfig/config_test.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 )
 
 func parse(t *testing.T, args string) (*Config, *HostConfig, error) {

components/engine/runconfig/hostconfig.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/pkg/ulimit"
 )
 

components/engine/runconfig/merge.go

@@ -3,7 +3,7 @@ package runconfig
 import (
 	"strings"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 )
 
 func Merge(userConf, imageConf *Config) error {

components/engine/runconfig/parse.go

@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/nat"
 	"github.com/docker/docker/opts"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/pkg/parsers"
 	"github.com/docker/docker/pkg/ulimit"
 	"github.com/docker/docker/pkg/units"