Browse Source

Move blkiodev package to types.

Signed-off-by: David Calavera <david.calavera@gmail.com>
David Calavera 9 years ago
parent
commit
0aab83d996
6 changed files with 6 additions and 8 deletions
  1. 1 3
      api/types/blkiodev/blkio.go
  2. 1 1
      daemon/daemon_unix.go
  3. 1 1
      opts/opts.go
  4. 1 1
      opts/throttledevice.go
  5. 1 1
      opts/weightdevice.go
  6. 1 1
      runconfig/hostconfig.go

+ 1 - 3
pkg/blkiodev/blkiodev.go → 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 {

+ 1 - 1
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"

+ 1 - 1
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"
 )
 

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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"
 )