From 0aab83d996f645a2e1e28b1e2c03b530c13a5fc1 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Fri, 18 Dec 2015 12:44:39 -0500 Subject: [PATCH] Move blkiodev package to types. Signed-off-by: David Calavera --- pkg/blkiodev/blkiodev.go => api/types/blkiodev/blkio.go | 4 +--- daemon/daemon_unix.go | 2 +- opts/opts.go | 2 +- opts/throttledevice.go | 2 +- opts/weightdevice.go | 2 +- runconfig/hostconfig.go | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) rename pkg/blkiodev/blkiodev.go => api/types/blkiodev/blkio.go (96%) mode change 100755 => 100644 daemon/daemon_unix.go diff --git a/pkg/blkiodev/blkiodev.go b/api/types/blkiodev/blkio.go similarity index 96% rename from pkg/blkiodev/blkiodev.go rename to api/types/blkiodev/blkio.go index e9a3649fce..458a9c96bb 100644 --- a/pkg/blkiodev/blkiodev.go +++ b/api/types/blkiodev/blkio.go @@ -1,8 +1,6 @@ package blkiodev -import ( - "fmt" -) +import "fmt" // WeightDevice is a structure that hold device:weight pair type WeightDevice struct { diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go old mode 100755 new mode 100644 index b30b2dafc0..a9c0dcc766 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -12,12 +12,12 @@ import ( "syscall" "github.com/Sirupsen/logrus" + pblkiodev "github.com/docker/docker/api/types/blkiodev" "github.com/docker/docker/container" "github.com/docker/docker/daemon/graphdriver" derr "github.com/docker/docker/errors" "github.com/docker/docker/image" "github.com/docker/docker/layer" - pblkiodev "github.com/docker/docker/pkg/blkiodev" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/sysinfo" diff --git a/opts/opts.go b/opts/opts.go index 1a77e20c7a..98a0319750 100644 --- a/opts/opts.go +++ b/opts/opts.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/docker/docker/pkg/blkiodev" + "github.com/docker/docker/api/types/blkiodev" "github.com/docker/go-units" ) diff --git a/opts/throttledevice.go b/opts/throttledevice.go index fb11802326..6d3e31bc04 100644 --- a/opts/throttledevice.go +++ b/opts/throttledevice.go @@ -3,7 +3,7 @@ package opts import ( "fmt" - "github.com/docker/docker/pkg/blkiodev" + "github.com/docker/docker/api/types/blkiodev" ) // ThrottledeviceOpt defines a map of ThrottleDevices diff --git a/opts/weightdevice.go b/opts/weightdevice.go index 4c6288f6af..2c94af3bf0 100644 --- a/opts/weightdevice.go +++ b/opts/weightdevice.go @@ -3,7 +3,7 @@ package opts import ( "fmt" - "github.com/docker/docker/pkg/blkiodev" + "github.com/docker/docker/api/types/blkiodev" ) // WeightdeviceOpt defines a map of WeightDevices diff --git a/runconfig/hostconfig.go b/runconfig/hostconfig.go index f901767d93..462502a2f6 100644 --- a/runconfig/hostconfig.go +++ b/runconfig/hostconfig.go @@ -5,8 +5,8 @@ import ( "io" "strings" + "github.com/docker/docker/api/types/blkiodev" "github.com/docker/docker/api/types/strslice" - "github.com/docker/docker/pkg/blkiodev" "github.com/docker/docker/pkg/nat" "github.com/docker/docker/pkg/ulimit" )