Replace pkg/units with docker/go-units.

Signed-off-by: David Calavera <david.calavera@gmail.com>

api/client/build.go

@@ -28,11 +28,11 @@ import (
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/pkg/ulimit"
-	"github.com/docker/docker/pkg/units"
 	"github.com/docker/docker/pkg/urlutil"
 	"github.com/docker/docker/registry"
 	tagpkg "github.com/docker/docker/tag"
 	"github.com/docker/docker/utils"
+	"github.com/docker/go-units"
 )
 
 // CmdBuild builds a new image from the source code at a given path.

api/client/history.go

@@ -11,7 +11,7 @@ import (
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/stringutils"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 // CmdHistory shows the history of an image.

api/client/images.go

@@ -13,7 +13,7 @@ import (
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/parsers/filters"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 // CmdImages lists the images in a specified repository, or all top-level images if no repository is specified.

api/client/info.go

@@ -6,7 +6,7 @@ import (
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/pkg/ioutils"
 	flag "github.com/docker/docker/pkg/mflag"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 // CmdInfo displays system-wide information.

api/client/lib/image_build.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/units"
 	"github.com/docker/docker/runconfig"
+	"github.com/docker/go-units"
 )
 
 var headerRegexp = regexp.MustCompile(`\ADocker/.+\s\((.+)\)\z`)

api/client/ps/custom.go

@@ -10,7 +10,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/stringutils"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 const (

api/client/stats.go

@@ -13,7 +13,7 @@ import (
 	"github.com/docker/docker/api/types"
 	Cli "github.com/docker/docker/cli"
 	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 type containerStats struct {

api/common_test.go

@@ -5,8 +5,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/docker/docker/api/types"
 	"os"
+
+	"github.com/docker/docker/api/types"
 )
 
 type ports struct {

container/state.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/docker/docker/daemon/execdriver"
 	derr "github.com/docker/docker/errors"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 // State holds the current container state, and has methods to get and

daemon/graphdriver/devmapper/deviceset.go

@@ -26,7 +26,7 @@ import (
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/mount"
 	"github.com/docker/docker/pkg/parsers"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 
 	"github.com/opencontainers/runc/libcontainer/label"
 )

daemon/graphdriver/devmapper/driver.go

@@ -15,7 +15,7 @@ import (
 	"github.com/docker/docker/pkg/devicemapper"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 func init() {

daemon/logger/jsonfilelog/jsonfilelog.go

@@ -14,7 +14,7 @@ import (
 	"github.com/docker/docker/daemon/logger"
 	"github.com/docker/docker/daemon/logger/loggerutils"
 	"github.com/docker/docker/pkg/jsonlog"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 // Name is the name of the file that the jsonlogger logs to.

opts/opts.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/docker/docker/pkg/blkiodev"
 	"github.com/docker/docker/pkg/parsers"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 var (

pkg/jsonmessage/jsonmessage.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/docker/docker/pkg/jsonlog"
 	"github.com/docker/docker/pkg/term"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 // JSONError wraps a concrete Code and Message, `Code` is

pkg/system/meminfo_linux.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 // ReadMemInfo retrieves memory statistics of the host system and returns a

pkg/system/meminfo_unix_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 // TestMemInfo tests parseMemInfo with a static meminfo string