Merge pull request #18682 from calavera/replace_units_package

Replace pkg/units with docker/go-units.
Upstream-commit: b44b5bbc8ba48f50343602a21e7d44c017c1e23d
Component: engine
This commit is contained in:
David Calavera
2015-12-16 10:48:59 -08:00
26 changed files with 269 additions and 172 deletions

View File

@ -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"
)

View File

@ -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() {