deleted file mode 100644

@@ -1,74 +0,0 @@

-package errdefs

-

-// ErrNotFound signals that the requested object doesn't exist

-type ErrNotFound interface {

-	NotFound()

-}

-

-// ErrInvalidParameter signals that the user input is invalid

-type ErrInvalidParameter interface {

-	InvalidParameter()

-}

-

-// ErrConflict signals that some internal state conflicts with the requested action and can't be performed.

-// A change in state should be able to clear this error.

-type ErrConflict interface {

-	Conflict()

-}

-

-// ErrUnauthorized is used to signify that the user is not authorized to perform a specific action

-type ErrUnauthorized interface {

-	Unauthorized()

-}

-

-// ErrUnavailable signals that the requested action/subsystem is not available.

-type ErrUnavailable interface {

-	Unavailable()

-}

-

-// ErrForbidden signals that the requested action cannot be performed under any circumstances.

-// When a ErrForbidden is returned, the caller should never retry the action.

-type ErrForbidden interface {

-	Forbidden()

-}

-

-// ErrSystem signals that some internal error occurred.

-// An example of this would be a failed mount request.

-type ErrSystem interface {

-	ErrSystem()

-}

-

-// ErrNotModified signals that an action can't be performed because it's already in the desired state

-type ErrNotModified interface {

-	NotModified()

-}

-

-// ErrAlreadyExists is a special case of ErrConflict which signals that the desired object already exists

-type ErrAlreadyExists interface {

-	AlreadyExists()

-}

-

-// ErrNotImplemented signals that the requested action/feature is not implemented on the system as configured.

-type ErrNotImplemented interface {

-	NotImplemented()

-}

-

-// ErrUnknown signals that the kind of error that occurred is not known.

-type ErrUnknown interface {

-	Unknown()

-}

-

-// ErrCancelled signals that the action was cancelled.

-type ErrCancelled interface {

-	Cancelled()

-}

-

-// ErrDeadline signals that the deadline was reached before the action completed.

-type ErrDeadline interface {

-	DeadlineExceeded()

-}

-

-// ErrDataLoss indicates that data was lost or there is data corruption.

-type ErrDataLoss interface {

-	DataLoss()

-}

deleted file mode 100644

@@ -1,8 +0,0 @@

-// Package errdefs defines a set of error interfaces that packages should use for communicating classes of errors.

-// Errors that cross the package boundary should implement one (and only one) of these interfaces.

-//

-// Packages should not reference these interfaces directly, only implement them.

-// To check if a particular error implements one of these interfaces, there are helper

-// functions provided (e.g. `Is<SomeError>`) which can be used rather than asserting the interfaces directly.

-// If you must assert on these interfaces, be sure to check the causal chain (`err.Cause()`).

-package errdefs

deleted file mode 100644

@@ -1,240 +0,0 @@

-package errdefs

-

-import "context"

-

-type errNotFound struct{ error }

-

-func (errNotFound) NotFound() {}

-

-func (e errNotFound) Cause() error {

-	return e.error

-}

-

-// NotFound is a helper to create an error of the class with the same name from any error type

-func NotFound(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errNotFound{err}

-}

-

-type errInvalidParameter struct{ error }

-

-func (errInvalidParameter) InvalidParameter() {}

-

-func (e errInvalidParameter) Cause() error {

-	return e.error

-}

-

-// InvalidParameter is a helper to create an error of the class with the same name from any error type

-func InvalidParameter(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errInvalidParameter{err}

-}

-

-type errConflict struct{ error }

-

-func (errConflict) Conflict() {}

-

-func (e errConflict) Cause() error {

-	return e.error

-}

-

-// Conflict is a helper to create an error of the class with the same name from any error type

-func Conflict(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errConflict{err}

-}

-

-type errUnauthorized struct{ error }

-

-func (errUnauthorized) Unauthorized() {}

-

-func (e errUnauthorized) Cause() error {

-	return e.error

-}

-

-// Unauthorized is a helper to create an error of the class with the same name from any error type

-func Unauthorized(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errUnauthorized{err}

-}

-

-type errUnavailable struct{ error }

-

-func (errUnavailable) Unavailable() {}

-

-func (e errUnavailable) Cause() error {

-	return e.error

-}

-

-// Unavailable is a helper to create an error of the class with the same name from any error type

-func Unavailable(err error) error {

-	return errUnavailable{err}

-}

-

-type errForbidden struct{ error }

-

-func (errForbidden) Forbidden() {}

-

-func (e errForbidden) Cause() error {

-	return e.error

-}

-

-// Forbidden is a helper to create an error of the class with the same name from any error type

-func Forbidden(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errForbidden{err}

-}

-

-type errSystem struct{ error }

-

-func (errSystem) System() {}

-

-func (e errSystem) Cause() error {

-	return e.error

-}

-

-// System is a helper to create an error of the class with the same name from any error type

-func System(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errSystem{err}

-}

-

-type errNotModified struct{ error }

-

-func (errNotModified) NotModified() {}

-

-func (e errNotModified) Cause() error {

-	return e.error

-}

-

-// NotModified is a helper to create an error of the class with the same name from any error type

-func NotModified(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errNotModified{err}

-}

-

-type errAlreadyExists struct{ error }

-

-func (errAlreadyExists) AlreadyExists() {}

-

-func (e errAlreadyExists) Cause() error {

-	return e.error

-}

-

-// AlreadyExists is a helper to create an error of the class with the same name from any error type

-func AlreadyExists(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errAlreadyExists{err}

-}

-

-type errNotImplemented struct{ error }

-

-func (errNotImplemented) NotImplemented() {}

-

-func (e errNotImplemented) Cause() error {

-	return e.error

-}

-

-// NotImplemented is a helper to create an error of the class with the same name from any error type

-func NotImplemented(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errNotImplemented{err}

-}

-

-type errUnknown struct{ error }

-

-func (errUnknown) Unknown() {}

-

-func (e errUnknown) Cause() error {

-	return e.error

-}

-

-// Unknown is a helper to create an error of the class with the same name from any error type

-func Unknown(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errUnknown{err}

-}

-

-type errCancelled struct{ error }

-

-func (errCancelled) Cancelled() {}

-

-func (e errCancelled) Cause() error {

-	return e.error

-}

-

-// Cancelled is a helper to create an error of the class with the same name from any error type

-func Cancelled(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errCancelled{err}

-}

-

-type errDeadline struct{ error }

-

-func (errDeadline) DeadlineExceeded() {}

-

-func (e errDeadline) Cause() error {

-	return e.error

-}

-

-// Deadline is a helper to create an error of the class with the same name from any error type

-func Deadline(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errDeadline{err}

-}

-

-type errDataLoss struct{ error }

-

-func (errDataLoss) DataLoss() {}

-

-func (e errDataLoss) Cause() error {

-	return e.error

-}

-

-// DataLoss is a helper to create an error of the class with the same name from any error type

-func DataLoss(err error) error {

-	if err == nil {

-		return nil

-	}

-	return errDataLoss{err}

-}

-

-// FromContext returns the error class from the passed in context

-func FromContext(ctx context.Context) error {

-	e := ctx.Err()

-	if e == nil {

-		return nil

-	}

-

-	if e == context.Canceled {

-		return Cancelled(e)

-	}

-	if e == context.DeadlineExceeded {

-		return Deadline(e)

-	}

-	return Unknown(e)

-}

deleted file mode 100644

@@ -1,132 +0,0 @@

-package errdefs

-

-import (

-	"errors"

-	"testing"

-)

-

-var errTest = errors.New("this is a test")

-

-type causal interface {

-	Cause() error

-}

-

-func TestNotFound(t *testing.T) {

-	e := NotFound(errTest)

-	if !IsNotFound(e) {

-		t.Fatalf("expected not found error, got: %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestConflict(t *testing.T) {

-	e := Conflict(errTest)

-	if !IsConflict(e) {

-		t.Fatalf("expected conflcit error, got: %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestForbidden(t *testing.T) {

-	e := Forbidden(errTest)

-	if !IsForbidden(e) {

-		t.Fatalf("expected forbidden error, got: %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestInvalidParameter(t *testing.T) {

-	e := InvalidParameter(errTest)

-	if !IsInvalidParameter(e) {

-		t.Fatalf("expected invalid argument error, got %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestNotImplemented(t *testing.T) {

-	e := NotImplemented(errTest)

-	if !IsNotImplemented(e) {

-		t.Fatalf("expected not implemented error, got %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestNotModified(t *testing.T) {

-	e := NotModified(errTest)

-	if !IsNotModified(e) {

-		t.Fatalf("expected not modified error, got %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestAlreadyExists(t *testing.T) {

-	e := AlreadyExists(errTest)

-	if !IsAlreadyExists(e) {

-		t.Fatalf("expected already exists error, got %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestUnauthorized(t *testing.T) {

-	e := Unauthorized(errTest)

-	if !IsUnauthorized(e) {

-		t.Fatalf("expected unauthorized error, got %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestUnknown(t *testing.T) {

-	e := Unknown(errTest)

-	if !IsUnknown(e) {

-		t.Fatalf("expected unknown error, got %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestCancelled(t *testing.T) {

-	e := Cancelled(errTest)

-	if !IsCancelled(e) {

-		t.Fatalf("expected canclled error, got %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestDeadline(t *testing.T) {

-	e := Deadline(errTest)

-	if !IsDeadline(e) {

-		t.Fatalf("expected deadline error, got %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

-

-func TestIsDataLoss(t *testing.T) {

-	e := DataLoss(errTest)

-	if !IsDataLoss(e) {

-		t.Fatalf("expected data loss error, got %T", e)

-	}

-	if cause := e.(causal).Cause(); cause != errTest {

-		t.Fatalf("causual should be errTest, got: %v", cause)

-	}

-}

deleted file mode 100644

@@ -1,114 +0,0 @@

-package errdefs

-

-type causer interface {

-	Cause() error

-}

-

-func getImplementer(err error) error {

-	switch e := err.(type) {

-	case

-		ErrNotFound,

-		ErrInvalidParameter,

-		ErrConflict,

-		ErrUnauthorized,

-		ErrUnavailable,

-		ErrForbidden,

-		ErrSystem,

-		ErrNotModified,

-		ErrAlreadyExists,

-		ErrNotImplemented,

-		ErrCancelled,

-		ErrDeadline,

-		ErrDataLoss,

-		ErrUnknown:

-		return e

-	case causer:

-		return getImplementer(e.Cause())

-	default:

-		return err

-	}

-}

-

-// IsNotFound returns if the passed in error is an ErrNotFound

-func IsNotFound(err error) bool {

-	_, ok := getImplementer(err).(ErrNotFound)

-	return ok

-}

-

-// IsInvalidParameter returns if the passed in error is an ErrInvalidParameter

-func IsInvalidParameter(err error) bool {

-	_, ok := getImplementer(err).(ErrInvalidParameter)

-	return ok

-}

-

-// IsConflict returns if the passed in error is an ErrConflict

-func IsConflict(err error) bool {

-	_, ok := getImplementer(err).(ErrConflict)

-	return ok

-}

-

-// IsUnauthorized returns if the the passed in error is an ErrUnauthorized

-func IsUnauthorized(err error) bool {

-	_, ok := getImplementer(err).(ErrUnauthorized)

-	return ok

-}

-

-// IsUnavailable returns if the passed in error is an ErrUnavailable

-func IsUnavailable(err error) bool {

-	_, ok := getImplementer(err).(ErrUnavailable)

-	return ok

-}

-

-// IsForbidden returns if the passed in error is an ErrForbidden

-func IsForbidden(err error) bool {

-	_, ok := getImplementer(err).(ErrForbidden)

-	return ok

-}

-

-// IsSystem returns if the passed in error is an ErrSystem

-func IsSystem(err error) bool {

-	_, ok := getImplementer(err).(ErrSystem)

-	return ok

-}

-

-// IsNotModified returns if the passed in error is a NotModified error

-func IsNotModified(err error) bool {

-	_, ok := getImplementer(err).(ErrNotModified)

-	return ok

-}

-

-// IsAlreadyExists returns if the passed in error is a AlreadyExists error

-func IsAlreadyExists(err error) bool {

-	_, ok := getImplementer(err).(ErrAlreadyExists)

-	return ok

-}

-

-// IsNotImplemented returns if the passed in error is an ErrNotImplemented

-func IsNotImplemented(err error) bool {

-	_, ok := getImplementer(err).(ErrNotImplemented)

-	return ok

-}

-

-// IsUnknown returns if the passed in error is an ErrUnknown

-func IsUnknown(err error) bool {

-	_, ok := getImplementer(err).(ErrUnknown)

-	return ok

-}

-

-// IsCancelled returns if the passed in error is an ErrCancelled

-func IsCancelled(err error) bool {

-	_, ok := getImplementer(err).(ErrCancelled)

-	return ok

-}

-

-// IsDeadline returns if the passed in error is an ErrDeadline

-func IsDeadline(err error) bool {

-	_, ok := getImplementer(err).(ErrDeadline)

-	return ok

-}

-

-// IsDataLoss returns if the passed in error is an ErrDataLoss

-func IsDataLoss(err error) bool {

-	_, ok := getImplementer(err).(ErrDataLoss)

-	return ok

-}

@@ -4,9 +4,9 @@ import (

 	"fmt"

 	"net/http"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/gorilla/mux"

 	"github.com/sirupsen/logrus"

 	"google.golang.org/grpc"

@@ -6,7 +6,7 @@ import (

 	"net/http"

 	"strings"

-	"github.com/docker/docker/api/errdefs"

+	"github.com/docker/docker/errdefs"

 	"github.com/pkg/errors"

 	"github.com/sirupsen/logrus"

 	"golang.org/x/net/context"

@@ -13,12 +13,12 @@ import (

 	"strings"

 	"sync"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/progress"

 	"github.com/docker/docker/pkg/streamformatter"

@@ -8,7 +8,6 @@ import (

 	"strconv"

 	"syscall"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

@@ -16,6 +15,7 @@ import (

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/versions"

 	containerpkg "github.com/docker/docker/container"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/signal"

 	"github.com/pkg/errors"

@@ -7,10 +7,10 @@ import (

 	"net/http"

 	"strconv"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/stdcopy"

 	"github.com/sirupsen/logrus"

 	"golang.org/x/net/context"

@@ -10,12 +10,12 @@ import (

 	"strconv"

 	"strings"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/system"

@@ -8,12 +8,12 @@ import (

 	"golang.org/x/net/context"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/network"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/libnetwork"

 	netconst "github.com/docker/libnetwork/datastore"

 	"github.com/docker/libnetwork/networkdb"

@@ -3,7 +3,7 @@ package session

 import (

 	"net/http"

-	"github.com/docker/docker/api/errdefs"

+	"github.com/docker/docker/errdefs"

 	"golang.org/x/net/context"

 )

@@ -6,13 +6,13 @@ import (

 	"net/http"

 	"strconv"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/server/httputils"

 	basictypes "github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/api/types/filters"

 	types "github.com/docker/docker/api/types/swarm"

 	"github.com/docker/docker/api/types/versions"

+	"github.com/docker/docker/errdefs"

 	"github.com/pkg/errors"

 	"github.com/sirupsen/logrus"

 	"golang.org/x/net/context"

@@ -9,7 +9,6 @@ import (

 	"strings"

 	"time"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/api/types/container"

@@ -18,6 +17,7 @@ import (

 	"github.com/docker/docker/builder/dockerfile/parser"

 	"github.com/docker/docker/builder/fscache"

 	"github.com/docker/docker/builder/remotecontext"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/idtools"

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/stringid"

@@ -15,12 +15,12 @@ import (

 	"strings"

 	"github.com/docker/docker/api"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/strslice"

 	"github.com/docker/docker/builder"

 	"github.com/docker/docker/builder/dockerfile/instructions"

 	"github.com/docker/docker/builder/dockerfile/parser"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/pkg/signal"

@@ -24,10 +24,10 @@ import (

 	"strconv"

 	"strings"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/builder"

 	"github.com/docker/docker/builder/dockerfile/instructions"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/system"

 	"github.com/docker/docker/runconfig/opts"

 	"github.com/pkg/errors"

@@ -10,7 +10,7 @@ import (

 	"net/url"

 	"regexp"

-	"github.com/docker/docker/api/errdefs"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/pkg/errors"

 )

@@ -5,9 +5,9 @@ import (

 	"os"

 	"strings"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/container"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/chrootarchive"

 	"github.com/docker/docker/pkg/ioutils"

@@ -5,11 +5,11 @@ import (

 	"fmt"

 	"io"

-	"github.com/docker/docker/api/errdefs"

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/container/stream"

 	"github.com/docker/docker/daemon/logger"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/stdcopy"

 	"github.com/docker/docker/pkg/term"

 	"github.com/pkg/errors"

@@ -6,9 +6,9 @@ import (

 	"net/http"

 	"github.com/docker/distribution/reference"

-	"github.com/docker/docker/api/errdefs"

 	enginetypes "github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/swarm/runtime"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/plugin"

 	"github.com/docker/docker/plugin/v2"

 	"github.com/docker/swarmkit/api"

@@ -3,7 +3,7 @@ package cluster

 import (

 	"fmt"

-	"github.com/docker/docker/api/errdefs"

+	"github.com/docker/docker/errdefs"

 	swarmapi "github.com/docker/swarmkit/api"

 	"github.com/pkg/errors"

 	"golang.org/x/net/context"

@@ -3,11 +3,11 @@ package cluster

 import (

 	"fmt"

-	"github.com/docker/docker/api/errdefs"

 	apitypes "github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/network"

 	types "github.com/docker/docker/api/types/swarm"

 	"github.com/docker/docker/daemon/cluster/convert"

+	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/runconfig"

 	swarmapi "github.com/docker/swarmkit/api"

 	"github.com/pkg/errors"

@@ -1,10 +1,10 @@

 package cluster

 import (

-	"github.com/docker/docker/api/errdefs"

 	apitypes "github.com/docker/docker/api/types"

 	types "github.com/docker/docker/api/types/swarm"

 	"github.com/docker/docker/daemon/cluster/convert"

+	"github.com/docker/docker/errdefs"

 	swarmapi "github.com/docker/swarmkit/api"

 	"golang.org/x/net/context"

 )

@@ -11,12 +11,12 @@ import (

 	"time"

 	"github.com/docker/distribution/reference"

-	"github.com/docker/docker/api/errdefs"

 	apitypes "github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

 	types "github.com/docker/docker/api/types/swarm"

 	timetypes "github.com/docker/docker/api/types/time"

 	"github.com/docker/docker/daemon/cluster/convert"

+	"github.com/docker/docker/errdefs"

 	runconfigopts "github.com/docker/docker/runconfig/opts"

 	swarmapi "github.com/docker/swarmkit/api"

 	gogotypes "github.com/gogo/protobuf/types"