[hyper-provider] update hypercli in vendor

vendor/github.com/hyperhq/hypercli/daemon/archive.go

@@ -7,13 +7,13 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/hyperhq/hyper-api/types"
 	"github.com/hyperhq/hypercli/builder"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/pkg/archive"
 	"github.com/hyperhq/hypercli/pkg/chrootarchive"
 	"github.com/hyperhq/hypercli/pkg/idtools"
 	"github.com/hyperhq/hypercli/pkg/ioutils"
-	"github.com/docker/engine-api/types"
 )
 
 // ErrExtractPointNotDirectory is used to convey that the operation to extract

vendor/github.com/hyperhq/hypercli/daemon/commit.go

@@ -7,6 +7,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/docker/go-connections/nat"
+	"github.com/hyperhq/hyper-api/types"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/dockerversion"
 	"github.com/hyperhq/hypercli/image"
@@ -14,9 +17,6 @@ import (
 	"github.com/hyperhq/hypercli/pkg/archive"
 	"github.com/hyperhq/hypercli/pkg/ioutils"
 	"github.com/hyperhq/hypercli/reference"
-	"github.com/docker/engine-api/types"
-	containertypes "github.com/docker/engine-api/types/container"
-	"github.com/docker/go-connections/nat"
 )
 
 // merge merges two Config, the image container configuration (defaults values),

vendor/github.com/hyperhq/hypercli/daemon/config_unix.go

@@ -5,10 +5,10 @@ package daemon
 import (
 	"net"
 
+	"github.com/docker/go-units"
 	"github.com/hyperhq/hypercli/opts"
 	flag "github.com/hyperhq/hypercli/pkg/mflag"
 	runconfigopts "github.com/hyperhq/hypercli/runconfig/opts"
-	"github.com/docker/go-units"
 )
 
 var (

vendor/github.com/hyperhq/hypercli/daemon/container_operations_unix.go

@@ -13,6 +13,12 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/go-units"
+	"github.com/docker/libnetwork"
+	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/libnetwork/options"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
+	networktypes "github.com/hyperhq/hyper-api/types/network"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/daemon/execdriver"
 	"github.com/hyperhq/hypercli/daemon/links"
@@ -23,12 +29,6 @@ import (
 	"github.com/hyperhq/hypercli/pkg/mount"
 	"github.com/hyperhq/hypercli/pkg/stringid"
 	"github.com/hyperhq/hypercli/runconfig"
-	containertypes "github.com/docker/engine-api/types/container"
-	networktypes "github.com/docker/engine-api/types/network"
-	"github.com/docker/go-units"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/devices"
 	"github.com/opencontainers/runc/libcontainer/label"

vendor/github.com/hyperhq/hypercli/daemon/container_operations_windows.go

@@ -5,13 +5,13 @@ package daemon
 import (
 	"strings"
 
+	"github.com/docker/libnetwork"
+	networktypes "github.com/hyperhq/hyper-api/types/network"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/daemon/execdriver"
 	"github.com/hyperhq/hypercli/daemon/execdriver/windows"
 	derr "github.com/hyperhq/hypercli/errors"
 	"github.com/hyperhq/hypercli/layer"
-	networktypes "github.com/docker/engine-api/types/network"
-	"github.com/docker/libnetwork"
 )
 
 func (daemon *Daemon) setupLinkedContainers(container *container.Container) ([]string, error) {

vendor/github.com/hyperhq/hypercli/daemon/create.go

@@ -2,6 +2,9 @@ package daemon
 
 import (
 	"github.com/Sirupsen/logrus"
+	"github.com/hyperhq/hyper-api/types"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
+	networktypes "github.com/hyperhq/hyper-api/types/network"
 	"github.com/hyperhq/hypercli/container"
 	derr "github.com/hyperhq/hypercli/errors"
 	"github.com/hyperhq/hypercli/image"
@@ -9,9 +12,6 @@ import (
 	"github.com/hyperhq/hypercli/pkg/idtools"
 	"github.com/hyperhq/hypercli/pkg/stringid"
 	volumestore "github.com/hyperhq/hypercli/volume/store"
-	"github.com/docker/engine-api/types"
-	containertypes "github.com/docker/engine-api/types/container"
-	networktypes "github.com/docker/engine-api/types/network"
 	"github.com/opencontainers/runc/libcontainer/label"
 )
 

vendor/github.com/hyperhq/hypercli/daemon/create_unix.go

@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 
 	"github.com/Sirupsen/logrus"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
 	derr "github.com/hyperhq/hypercli/errors"
 	"github.com/hyperhq/hypercli/pkg/stringid"
-	containertypes "github.com/docker/engine-api/types/container"
 	"github.com/opencontainers/runc/libcontainer/label"
 )
 

vendor/github.com/hyperhq/hypercli/daemon/create_windows.go

@@ -3,10 +3,10 @@ package daemon
 import (
 	"fmt"
 
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/pkg/stringid"
 	"github.com/hyperhq/hypercli/volume"
-	containertypes "github.com/docker/engine-api/types/container"
 )
 
 // createContainerPlatformSpecificSettings performs platform specific container create functionality

vendor/github.com/hyperhq/hypercli/daemon/daemon.go

@@ -21,6 +21,13 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/distribution/digest"
+	"github.com/hyperhq/hyper-api/types"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
+	eventtypes "github.com/hyperhq/hyper-api/types/events"
+	"github.com/hyperhq/hyper-api/types/filters"
+	networktypes "github.com/hyperhq/hyper-api/types/network"
+	registrytypes "github.com/hyperhq/hyper-api/types/registry"
+	"github.com/hyperhq/hyper-api/types/strslice"
 	"github.com/hyperhq/hypercli/api"
 	"github.com/hyperhq/hypercli/builder"
 	"github.com/hyperhq/hypercli/container"
@@ -28,14 +35,11 @@ import (
 	"github.com/hyperhq/hypercli/daemon/exec"
 	"github.com/hyperhq/hypercli/daemon/execdriver"
 	"github.com/hyperhq/hypercli/daemon/execdriver/execdrivers"
-	"github.com/docker/engine-api/types"
-	containertypes "github.com/docker/engine-api/types/container"
-	eventtypes "github.com/docker/engine-api/types/events"
-	"github.com/docker/engine-api/types/filters"
-	networktypes "github.com/docker/engine-api/types/network"
-	registrytypes "github.com/docker/engine-api/types/registry"
-	"github.com/docker/engine-api/types/strslice"
 	// register graph drivers
+	"github.com/docker/go-connections/nat"
+	"github.com/docker/libnetwork"
+	lntypes "github.com/docker/libnetwork/types"
+	"github.com/docker/libtrust"
 	_ "github.com/hyperhq/hypercli/daemon/graphdriver/register"
 	"github.com/hyperhq/hypercli/daemon/logger"
 	"github.com/hyperhq/hypercli/daemon/network"
@@ -69,10 +73,6 @@ import (
 	volumedrivers "github.com/hyperhq/hypercli/volume/drivers"
 	"github.com/hyperhq/hypercli/volume/local"
 	"github.com/hyperhq/hypercli/volume/store"
-	"github.com/docker/go-connections/nat"
-	"github.com/docker/libnetwork"
-	lntypes "github.com/docker/libnetwork/types"
-	"github.com/docker/libtrust"
 	"github.com/opencontainers/runc/libcontainer"
 	"golang.org/x/net/context"
 )

vendor/github.com/hyperhq/hypercli/daemon/daemon_experimental.go

@@ -2,7 +2,7 @@
 
 package daemon
 
-import "github.com/docker/engine-api/types/container"
+import "github.com/hyperhq/hyper-api/types/container"
 
 func (daemon *Daemon) verifyExperimentalContainerSettings(hostConfig *container.HostConfig, config *container.Config) ([]string, error) {
 	return nil, nil

vendor/github.com/hyperhq/hypercli/daemon/daemon_stub.go

@@ -2,7 +2,7 @@
 
 package daemon
 
-import "github.com/docker/engine-api/types/container"
+import "github.com/hyperhq/hyper-api/types/container"
 
 func (daemon *Daemon) verifyExperimentalContainerSettings(hostConfig *container.HostConfig, config *container.Config) ([]string, error) {
 	return nil, nil

vendor/github.com/hyperhq/hypercli/daemon/daemon_test.go

@@ -8,6 +8,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/docker/go-connections/nat"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/pkg/discovery"
 	_ "github.com/hyperhq/hypercli/pkg/discovery/memory"
@@ -17,8 +19,6 @@ import (
 	volumedrivers "github.com/hyperhq/hypercli/volume/drivers"
 	"github.com/hyperhq/hypercli/volume/local"
 	"github.com/hyperhq/hypercli/volume/store"
-	containertypes "github.com/docker/engine-api/types/container"
-	"github.com/docker/go-connections/nat"
 )
 
 //

vendor/github.com/hyperhq/hypercli/daemon/daemon_unix.go

@@ -15,6 +15,15 @@ import (
 	"syscall"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/libnetwork"
+	nwconfig "github.com/docker/libnetwork/config"
+	"github.com/docker/libnetwork/drivers/bridge"
+	"github.com/docker/libnetwork/ipamutils"
+	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/libnetwork/options"
+	"github.com/docker/libnetwork/types"
+	pblkiodev "github.com/hyperhq/hyper-api/types/blkiodev"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
 	derr "github.com/hyperhq/hypercli/errors"
 	"github.com/hyperhq/hypercli/image"
@@ -26,15 +35,6 @@ import (
 	"github.com/hyperhq/hypercli/reference"
 	"github.com/hyperhq/hypercli/runconfig"
 	runconfigopts "github.com/hyperhq/hypercli/runconfig/opts"
-	pblkiodev "github.com/docker/engine-api/types/blkiodev"
-	containertypes "github.com/docker/engine-api/types/container"
-	"github.com/docker/libnetwork"
-	nwconfig "github.com/docker/libnetwork/config"
-	"github.com/docker/libnetwork/drivers/bridge"
-	"github.com/docker/libnetwork/ipamutils"
-	"github.com/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
-	"github.com/docker/libnetwork/types"
 	blkiodev "github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/label"
 	"github.com/opencontainers/runc/libcontainer/user"

vendor/github.com/hyperhq/hypercli/daemon/daemon_unix_test.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"testing"
 
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
-	containertypes "github.com/docker/engine-api/types/container"
 )
 
 // Unix test as uses settings which are not available on Windows

vendor/github.com/hyperhq/hypercli/daemon/daemon_windows.go

@@ -10,18 +10,18 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/daemon/graphdriver"
 	"github.com/hyperhq/hypercli/dockerversion"
 	"github.com/hyperhq/hypercli/image"
 	"github.com/hyperhq/hypercli/layer"
 	"github.com/hyperhq/hypercli/reference"
-	containertypes "github.com/docker/engine-api/types/container"
 	// register the windows graph driver
+	"github.com/docker/libnetwork"
 	"github.com/hyperhq/hypercli/daemon/graphdriver/windows"
 	"github.com/hyperhq/hypercli/pkg/idtools"
 	"github.com/hyperhq/hypercli/pkg/system"
-	"github.com/docker/libnetwork"
 	blkiodev "github.com/opencontainers/runc/libcontainer/configs"
 )
 

vendor/github.com/hyperhq/hypercli/daemon/delete.go

@@ -7,11 +7,11 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/hyperhq/hyper-api/types"
 	"github.com/hyperhq/hypercli/container"
 	derr "github.com/hyperhq/hypercli/errors"
 	"github.com/hyperhq/hypercli/layer"
 	volumestore "github.com/hyperhq/hypercli/volume/store"
-	"github.com/docker/engine-api/types"
 )
 
 // ContainerRm removes the container id from the filesystem. An error

vendor/github.com/hyperhq/hypercli/daemon/delete_test.go

@@ -5,9 +5,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/hyperhq/hyper-api/types"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
-	"github.com/docker/engine-api/types"
-	containertypes "github.com/docker/engine-api/types/container"
 )
 
 func TestContainerDoubleDelete(t *testing.T) {

vendor/github.com/hyperhq/hypercli/daemon/events.go

@@ -3,9 +3,9 @@ package daemon
 import (
 	"strings"
 
-	"github.com/hyperhq/hypercli/container"
-	"github.com/docker/engine-api/types/events"
 	"github.com/docker/libnetwork"
+	"github.com/hyperhq/hyper-api/types/events"
+	"github.com/hyperhq/hypercli/container"
 )
 
 // LogContainerEvent generates an event related to a container with only the default attributes.

vendor/github.com/hyperhq/hypercli/daemon/events/events.go

@@ -4,8 +4,8 @@ import (
 	"sync"
 	"time"
 
+	eventtypes "github.com/hyperhq/hyper-api/types/events"
 	"github.com/hyperhq/hypercli/pkg/pubsub"
-	eventtypes "github.com/docker/engine-api/types/events"
 )
 
 const (

vendor/github.com/hyperhq/hypercli/daemon/events/events_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/engine-api/types/events"
+	"github.com/hyperhq/hyper-api/types/events"
 )
 
 func TestEventsLog(t *testing.T) {

vendor/github.com/hyperhq/hypercli/daemon/events/filter.go

@@ -1,9 +1,9 @@
 package events
 
 import (
+	"github.com/hyperhq/hyper-api/types/events"
+	"github.com/hyperhq/hyper-api/types/filters"
 	"github.com/hyperhq/hypercli/reference"
-	"github.com/docker/engine-api/types/events"
-	"github.com/docker/engine-api/types/filters"
 )
 
 // Filter can filter out docker events from a stream

vendor/github.com/hyperhq/hypercli/daemon/events_test.go

@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
+	containertypes "github.com/hyperhq/hyper-api/types/container"
+	eventtypes "github.com/hyperhq/hyper-api/types/events"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/daemon/events"
-	containertypes "github.com/docker/engine-api/types/container"
-	eventtypes "github.com/docker/engine-api/types/events"
 )
 
 func TestLogContainerEventCopyLabels(t *testing.T) {

vendor/github.com/hyperhq/hypercli/daemon/exec.go

@@ -6,6 +6,8 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/hyperhq/hyper-api/types"
+	"github.com/hyperhq/hyper-api/types/strslice"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/daemon/exec"
 	"github.com/hyperhq/hypercli/daemon/execdriver"
@@ -13,8 +15,6 @@ import (
 	"github.com/hyperhq/hypercli/pkg/pools"
 	"github.com/hyperhq/hypercli/pkg/promise"
 	"github.com/hyperhq/hypercli/pkg/term"
-	"github.com/docker/engine-api/types"
-	"github.com/docker/engine-api/types/strslice"
 )
 
 func (d *Daemon) registerExecCommand(container *container.Container, config *exec.Config) {

vendor/github.com/hyperhq/hypercli/daemon/exec_unix.go

@@ -3,9 +3,9 @@
 package daemon
 
 import (
+	"github.com/hyperhq/hyper-api/types"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/daemon/execdriver"
-	"github.com/docker/engine-api/types"
 )
 
 // setPlatformSpecificExecProcessConfig sets platform-specific fields in the

vendor/github.com/hyperhq/hypercli/daemon/exec_windows.go

@@ -1,9 +1,9 @@
 package daemon
 
 import (
+	"github.com/hyperhq/hyper-api/types"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/daemon/execdriver"
-	"github.com/docker/engine-api/types"
 )
 
 // setPlatformSpecificExecProcessConfig sets platform-specific fields in the

vendor/github.com/hyperhq/hypercli/daemon/execdriver/driver_unix.go

@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/docker/go-units"
 	"github.com/hyperhq/hypercli/daemon/execdriver/native/template"
 	"github.com/hyperhq/hypercli/pkg/idtools"
 	"github.com/hyperhq/hypercli/pkg/mount"
-	"github.com/docker/go-units"
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer/cgroups/fs"
 	"github.com/opencontainers/runc/libcontainer/configs"

vendor/github.com/hyperhq/hypercli/daemon/execdriver/windows/windows.go

@@ -9,10 +9,10 @@ import (
 	"sync"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/daemon/execdriver"
 	"github.com/hyperhq/hypercli/dockerversion"
 	"github.com/hyperhq/hypercli/pkg/parsers"
-	"github.com/docker/engine-api/types/container"
 	"golang.org/x/sys/windows/registry"
 )
 

vendor/github.com/hyperhq/hypercli/daemon/graphdriver/devmapper/deviceset.go

@@ -21,13 +21,13 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
+	"github.com/docker/go-units"
 	"github.com/hyperhq/hypercli/daemon/graphdriver"
 	"github.com/hyperhq/hypercli/pkg/devicemapper"
 	"github.com/hyperhq/hypercli/pkg/idtools"
 	"github.com/hyperhq/hypercli/pkg/loopback"
 	"github.com/hyperhq/hypercli/pkg/mount"
 	"github.com/hyperhq/hypercli/pkg/parsers"
-	"github.com/docker/go-units"
 
 	"github.com/opencontainers/runc/libcontainer/label"
 )

vendor/github.com/hyperhq/hypercli/daemon/graphdriver/devmapper/driver.go

@@ -11,11 +11,11 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
+	"github.com/docker/go-units"
 	"github.com/hyperhq/hypercli/daemon/graphdriver"
 	"github.com/hyperhq/hypercli/pkg/devicemapper"
 	"github.com/hyperhq/hypercli/pkg/idtools"
 	"github.com/hyperhq/hypercli/pkg/mount"
-	"github.com/docker/go-units"
 )
 
 func init() {

vendor/github.com/hyperhq/hypercli/daemon/image_delete.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/hyperhq/hyper-api/types"
 	"github.com/hyperhq/hypercli/container"
 	derr "github.com/hyperhq/hypercli/errors"
 	"github.com/hyperhq/hypercli/image"
 	"github.com/hyperhq/hypercli/pkg/stringid"
 	"github.com/hyperhq/hypercli/reference"
-	"github.com/docker/engine-api/types"
 )
 
 type conflictType int

vendor/github.com/hyperhq/hypercli/daemon/images.go

@@ -5,11 +5,11 @@ import (
 	"path"
 	"sort"
 
+	"github.com/hyperhq/hyper-api/types"
+	"github.com/hyperhq/hyper-api/types/filters"
 	"github.com/hyperhq/hypercli/image"
 	"github.com/hyperhq/hypercli/layer"
 	"github.com/hyperhq/hypercli/reference"
-	"github.com/docker/engine-api/types"
-	"github.com/docker/engine-api/types/filters"
 )
 
 var acceptedImageFilterTags = map[string]bool{

vendor/github.com/hyperhq/hypercli/daemon/import.go

@@ -8,6 +8,7 @@ import (
 	"runtime"
 	"time"
 
+	"github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/dockerversion"
 	"github.com/hyperhq/hypercli/image"
 	"github.com/hyperhq/hypercli/layer"
@@ -15,7 +16,6 @@ import (
 	"github.com/hyperhq/hypercli/pkg/progress"
 	"github.com/hyperhq/hypercli/pkg/streamformatter"
 	"github.com/hyperhq/hypercli/reference"
-	"github.com/docker/engine-api/types/container"
 )
 
 // ImportImage imports an image, getting the archived layer data either from

vendor/github.com/hyperhq/hypercli/daemon/info.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/hyperhq/hyper-api/types"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/dockerversion"
 	"github.com/hyperhq/hypercli/pkg/fileutils"
@@ -19,7 +20,6 @@ import (
 	"github.com/hyperhq/hypercli/registry"
 	"github.com/hyperhq/hypercli/utils"
 	"github.com/hyperhq/hypercli/volume/drivers"
-	"github.com/docker/engine-api/types"
 )
 
 // SystemInfo returns information about the host server the daemon is running on.

vendor/github.com/hyperhq/hypercli/daemon/inspect.go

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hyperhq/hyper-api/types"
+	networktypes "github.com/hyperhq/hyper-api/types/network"
+	"github.com/hyperhq/hyper-api/types/versions/v1p20"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/daemon/exec"
 	"github.com/hyperhq/hypercli/daemon/network"
 	"github.com/hyperhq/hypercli/pkg/version"
-	"github.com/docker/engine-api/types"
-	networktypes "github.com/docker/engine-api/types/network"
-	"github.com/docker/engine-api/types/versions/v1p20"
 )
 
 // ContainerInspect returns low-level information about a

vendor/github.com/hyperhq/hypercli/daemon/inspect_unix.go

@@ -3,9 +3,9 @@
 package daemon
 
 import (
+	"github.com/hyperhq/hyper-api/types"
+	"github.com/hyperhq/hyper-api/types/versions/v1p19"
 	"github.com/hyperhq/hypercli/container"
-	"github.com/docker/engine-api/types"
-	"github.com/docker/engine-api/types/versions/v1p19"
 )
 
 // This sets platform-specific fields

vendor/github.com/hyperhq/hypercli/daemon/inspect_windows.go

@@ -1,8 +1,8 @@
 package daemon
 
 import (
+	"github.com/hyperhq/hyper-api/types"
 	"github.com/hyperhq/hypercli/container"
-	"github.com/docker/engine-api/types"
 )
 
 // This sets platform-specific fields

vendor/github.com/hyperhq/hypercli/daemon/links_test.go

@@ -8,10 +8,10 @@ import (
 	"path/filepath"
 	"testing"
 
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/pkg/graphdb"
 	"github.com/hyperhq/hypercli/pkg/stringid"
-	containertypes "github.com/docker/engine-api/types/container"
 )
 
 func TestMigrateLegacySqliteLinks(t *testing.T) {

vendor/github.com/hyperhq/hypercli/daemon/list.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/go-connections/nat"
+	"github.com/hyperhq/hyper-api/types"
+	"github.com/hyperhq/hyper-api/types/filters"
+	networktypes "github.com/hyperhq/hyper-api/types/network"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/image"
-	"github.com/docker/engine-api/types"
-	"github.com/docker/engine-api/types/filters"
-	networktypes "github.com/docker/engine-api/types/network"
-	"github.com/docker/go-connections/nat"
 )
 
 var acceptedVolumeFilterTags = map[string]bool{

vendor/github.com/hyperhq/hypercli/daemon/logger/fluentd/fluentd.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/fluent/fluent-logger-golang/fluent"
 	"github.com/hyperhq/hypercli/daemon/logger"
 	"github.com/hyperhq/hypercli/daemon/logger/loggerutils"
-	"github.com/fluent/fluent-logger-golang/fluent"
 )
 
 type fluentd struct {

vendor/github.com/hyperhq/hypercli/daemon/logger/jsonfilelog/jsonfilelog.go

@@ -11,10 +11,10 @@ import (
 	"sync"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/go-units"
 	"github.com/hyperhq/hypercli/daemon/logger"
 	"github.com/hyperhq/hypercli/daemon/logger/loggerutils"
 	"github.com/hyperhq/hypercli/pkg/jsonlog"
-	"github.com/docker/go-units"
 )
 
 // Name is the name of the file that the jsonlogger logs to.

vendor/github.com/hyperhq/hypercli/daemon/logger/syslog/syslog.go

@@ -17,10 +17,10 @@ import (
 	syslog "github.com/RackSec/srslog"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/go-connections/tlsconfig"
 	"github.com/hyperhq/hypercli/daemon/logger"
 	"github.com/hyperhq/hypercli/daemon/logger/loggerutils"
 	"github.com/hyperhq/hypercli/pkg/urlutil"
-	"github.com/docker/go-connections/tlsconfig"
 )
 
 const (

vendor/github.com/hyperhq/hypercli/daemon/network.go

@@ -6,10 +6,10 @@ import (
 	"net"
 	"strings"
 
+	"github.com/docker/libnetwork"
+	"github.com/hyperhq/hyper-api/types/network"
 	derr "github.com/hyperhq/hypercli/errors"
 	"github.com/hyperhq/hypercli/runconfig"
-	"github.com/docker/engine-api/types/network"
-	"github.com/docker/libnetwork"
 )
 
 const (

vendor/github.com/hyperhq/hypercli/daemon/network/settings.go

@@ -1,8 +1,8 @@
 package network
 
 import (
-	networktypes "github.com/docker/engine-api/types/network"
 	"github.com/docker/go-connections/nat"
+	networktypes "github.com/hyperhq/hyper-api/types/network"
 )
 
 // Settings stores configuration details about the daemon network config

vendor/github.com/hyperhq/hypercli/daemon/rename.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	derr "github.com/hyperhq/hypercli/errors"
 	"github.com/docker/libnetwork"
+	derr "github.com/hyperhq/hypercli/errors"
 )
 
 // ContainerRename changes the name of a container, using the oldName

vendor/github.com/hyperhq/hypercli/daemon/start.go

@@ -5,10 +5,10 @@ import (
 	"runtime"
 
 	"github.com/Sirupsen/logrus"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
 	derr "github.com/hyperhq/hypercli/errors"
 	"github.com/hyperhq/hypercli/runconfig"
-	containertypes "github.com/docker/engine-api/types/container"
 )
 
 // ContainerStart starts a container.

vendor/github.com/hyperhq/hypercli/daemon/stats.go

@@ -6,10 +6,10 @@ import (
 	"io"
 	"runtime"
 
+	"github.com/hyperhq/hyper-api/types"
+	"github.com/hyperhq/hyper-api/types/versions/v1p20"
 	"github.com/hyperhq/hypercli/daemon/execdriver"
 	"github.com/hyperhq/hypercli/pkg/version"
-	"github.com/docker/engine-api/types"
-	"github.com/docker/engine-api/types/versions/v1p20"
 )
 
 // ContainerStatsConfig holds information for configuring the runtime

vendor/github.com/hyperhq/hypercli/daemon/stats_freebsd.go

@@ -1,7 +1,7 @@
 package daemon
 
 import (
-	"github.com/docker/engine-api/types"
+	"github.com/hyperhq/hyper-api/types"
 	"github.com/opencontainers/runc/libcontainer"
 )
 

vendor/github.com/hyperhq/hypercli/daemon/stats_linux.go

@@ -1,7 +1,7 @@
 package daemon
 
 import (
-	"github.com/docker/engine-api/types"
+	"github.com/hyperhq/hyper-api/types"
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer/cgroups"
 )

vendor/github.com/hyperhq/hypercli/daemon/stats_windows.go

@@ -1,7 +1,7 @@
 package daemon
 
 import (
-	"github.com/docker/engine-api/types"
+	"github.com/hyperhq/hyper-api/types"
 	"github.com/opencontainers/runc/libcontainer"
 )
 

vendor/github.com/hyperhq/hypercli/daemon/top_unix.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/hyperhq/hyper-api/types"
 	derr "github.com/hyperhq/hypercli/errors"
-	"github.com/docker/engine-api/types"
 )
 
 // ContainerTop lists the processes running inside of the given

vendor/github.com/hyperhq/hypercli/daemon/top_windows.go

@@ -1,8 +1,8 @@
 package daemon
 
 import (
+	"github.com/hyperhq/hyper-api/types"
 	derr "github.com/hyperhq/hypercli/errors"
-	"github.com/docker/engine-api/types"
 )
 
 // ContainerTop is not supported on Windows and returns an error.

vendor/github.com/hyperhq/hypercli/daemon/update.go

@@ -3,8 +3,8 @@ package daemon
 import (
 	"fmt"
 
+	"github.com/hyperhq/hyper-api/types/container"
 	derr "github.com/hyperhq/hypercli/errors"
-	"github.com/docker/engine-api/types/container"
 )
 
 // ContainerUpdate updates resources of the container

vendor/github.com/hyperhq/hypercli/daemon/volumes.go

@@ -6,12 +6,12 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/hyperhq/hyper-api/types"
+	containertypes "github.com/hyperhq/hyper-api/types/container"
 	"github.com/hyperhq/hypercli/container"
 	"github.com/hyperhq/hypercli/daemon/execdriver"
 	derr "github.com/hyperhq/hypercli/errors"
 	"github.com/hyperhq/hypercli/volume"
-	"github.com/docker/engine-api/types"
-	containertypes "github.com/docker/engine-api/types/container"
 	"github.com/opencontainers/runc/libcontainer/label"
 )