Move /nat to /pkg/nat

By convention /pkg is safe to use from outside the docker tree, for example
if you're building a docker orchestrator.

/nat currently doesn't have any dependencies outside of /pkg, so it seems
reasonable to move it there.

This rename was performed with:

```
gomvpkg -vcs_mv_cmd="git mv {{.Src}} {{.Dst}}" \
	-from github.com/docker/docker/nat \
        -to   github.com/docker/docker/pkg/nat

```

Signed-off-by: Peter Waller <p@pwaller.net>
Upstream-commit: 9c2374d19623581028f070bc93fa4c60a660dce4
Component: engine
This commit is contained in:
Peter Waller
2015-06-30 17:43:17 +01:00
parent e7e4c94326
commit 9161e24479
20 changed files with 16 additions and 16 deletions
+1 -1
View File
@@ -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.
+1 -1
View File
@@ -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"
)
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
@@ -1,7 +1,7 @@
package daemon
import (
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/nat"
"testing"
)
+1 -1
View File
@@ -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"
)
+1 -1
View File
@@ -1,6 +1,6 @@
package network
import "github.com/docker/docker/nat"
import "github.com/docker/docker/pkg/nat"
type Address struct {
Addr string
@@ -9,7 +9,7 @@ import (
"strings"
"time"
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/nat"
"github.com/go-check/check"
)
@@ -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"
)
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"path"
"strings"
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/nat"
)
type Link struct {
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strings"
"testing"
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/nat"
)
func TestLinkNaming(t *testing.T) {
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"io"
"strings"
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/nat"
)
// Entrypoint encapsulates the container entrypoint.
+1 -1
View File
@@ -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) {
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"io"
"strings"
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/nat"
"github.com/docker/docker/pkg/ulimit"
)
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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"