From a481c1b450352a8a503bea359c5d623c95db411f Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Mon, 23 Dec 2013 23:42:37 +0000 Subject: [PATCH] Move utility package 'term' to pkg/term Upstream-commit: 7ce7516c12f58aa71cd055b7c0bef6585d3f2ab3 Component: engine --- components/engine/commands.go | 2 +- components/engine/container.go | 2 +- components/engine/integration/commands_test.go | 2 +- components/engine/{ => pkg}/term/MAINTAINERS | 0 components/engine/{ => pkg}/term/term.go | 0 components/engine/{ => pkg}/term/termios_darwin.go | 0 components/engine/{ => pkg}/term/termios_linux.go | 0 components/engine/utils/jsonmessage.go | 2 +- 8 files changed, 4 insertions(+), 4 deletions(-) rename components/engine/{ => pkg}/term/MAINTAINERS (100%) rename components/engine/{ => pkg}/term/term.go (100%) rename components/engine/{ => pkg}/term/termios_darwin.go (100%) rename components/engine/{ => pkg}/term/termios_linux.go (100%) diff --git a/components/engine/commands.go b/components/engine/commands.go index ff4b12e942..0627261d53 100644 --- a/components/engine/commands.go +++ b/components/engine/commands.go @@ -13,7 +13,7 @@ import ( "github.com/dotcloud/docker/auth" "github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/registry" - "github.com/dotcloud/docker/term" + "github.com/dotcloud/docker/pkg/term" "github.com/dotcloud/docker/utils" "io" "io/ioutil" diff --git a/components/engine/container.go b/components/engine/container.go index bb591669af..532a697839 100644 --- a/components/engine/container.go +++ b/components/engine/container.go @@ -8,7 +8,7 @@ import ( "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/graphdriver" "github.com/dotcloud/docker/mount" - "github.com/dotcloud/docker/term" + "github.com/dotcloud/docker/pkg/term" "github.com/dotcloud/docker/utils" "github.com/kr/pty" "io" diff --git a/components/engine/integration/commands_test.go b/components/engine/integration/commands_test.go index af720f67e6..a4884470fb 100644 --- a/components/engine/integration/commands_test.go +++ b/components/engine/integration/commands_test.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/dotcloud/docker" "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/term" + "github.com/dotcloud/docker/pkg/term" "github.com/dotcloud/docker/utils" "io" "io/ioutil" diff --git a/components/engine/term/MAINTAINERS b/components/engine/pkg/term/MAINTAINERS similarity index 100% rename from components/engine/term/MAINTAINERS rename to components/engine/pkg/term/MAINTAINERS diff --git a/components/engine/term/term.go b/components/engine/pkg/term/term.go similarity index 100% rename from components/engine/term/term.go rename to components/engine/pkg/term/term.go diff --git a/components/engine/term/termios_darwin.go b/components/engine/pkg/term/termios_darwin.go similarity index 100% rename from components/engine/term/termios_darwin.go rename to components/engine/pkg/term/termios_darwin.go diff --git a/components/engine/term/termios_linux.go b/components/engine/pkg/term/termios_linux.go similarity index 100% rename from components/engine/term/termios_linux.go rename to components/engine/pkg/term/termios_linux.go diff --git a/components/engine/utils/jsonmessage.go b/components/engine/utils/jsonmessage.go index cc467162f9..e06780fc1e 100644 --- a/components/engine/utils/jsonmessage.go +++ b/components/engine/utils/jsonmessage.go @@ -3,7 +3,7 @@ package utils import ( "encoding/json" "fmt" - "github.com/dotcloud/docker/term" + "github.com/dotcloud/docker/pkg/term" "io" "strings" "time"