From 0595bffeac4faa8875d72d35296f7350df1c00a3 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 1 Apr 2014 07:07:42 +0000 Subject: [PATCH] Update imports to be consistent Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: 40c6d00c97c737d9d3827f159518007803affcc7 Component: engine --- components/engine/runtime/execdriver/native/create.go | 3 ++- components/engine/runtime/utils_test.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/engine/runtime/execdriver/native/create.go b/components/engine/runtime/execdriver/native/create.go index 976416a8ca..71fab3e064 100644 --- a/components/engine/runtime/execdriver/native/create.go +++ b/components/engine/runtime/execdriver/native/create.go @@ -2,12 +2,13 @@ package native import ( "fmt" + "os" + "github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/runtime/execdriver" "github.com/dotcloud/docker/runtime/execdriver/native/configuration" "github.com/dotcloud/docker/runtime/execdriver/native/template" - "os" ) // createContainer populates and configures the container type with the diff --git a/components/engine/runtime/utils_test.go b/components/engine/runtime/utils_test.go index 833634cb47..bdf3543a49 100644 --- a/components/engine/runtime/utils_test.go +++ b/components/engine/runtime/utils_test.go @@ -1,9 +1,10 @@ package runtime import ( + "testing" + "github.com/dotcloud/docker/runconfig" "github.com/dotcloud/docker/utils" - "testing" ) func TestMergeLxcConfig(t *testing.T) {