Merge pull request #44 from linkernetworks/johnlin/moby

use moby Former-commit-id: 58ca9872837b16a88ed0daa050587981dfbc65e1 [formerly 58ca9872837b16a88ed0daa050587981dfbc65e1 [formerly 040366b]] Former-commit-id: e27dbb76b0b47c855edeba167e2730ac404ed876 Former-commit-id: 6a142d7
linkernetworks · Jun 26, 2018 · a62f81b · a62f81b
2 parents f1c4c87 + 1ca34b1
commit a62f81b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/server/handler_network_test.go b/src/server/handler_network_test.go
@@ -9,11 +9,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/pkg/namesgenerator"
 	restful "github.com/emicklei/go-restful"
 	"github.com/linkernetworks/vortex/src/config"
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/serviceprovider"
+	"github.com/moby/moby/pkg/namesgenerator"
 	"github.com/stretchr/testify/assert"
 	mgo "gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"

diff --git a/src/server/handler_storage_provider_test.go b/src/server/handler_storage_provider_test.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/pkg/namesgenerator"
 	restful "github.com/emicklei/go-restful"
 	"github.com/linkernetworks/vortex/src/config"
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/serviceprovider"
+	"github.com/moby/moby/pkg/namesgenerator"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/mgo.v2/bson"
 )

diff --git a/src/server/handler_volume_test.go b/src/server/handler_volume_test.go
@@ -9,12 +9,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/pkg/namesgenerator"
 	restful "github.com/emicklei/go-restful"
 	"github.com/linkernetworks/mongo"
 	"github.com/linkernetworks/vortex/src/config"
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/serviceprovider"
+	"github.com/moby/moby/pkg/namesgenerator"
 	"github.com/stretchr/testify/suite"
 	"gopkg.in/mgo.v2/bson"
 	corev1 "k8s.io/api/core/v1"

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -62,12 +62,6 @@
 			"revision": "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e",
 			"revisionTime": "2018-03-08T23:13:08Z"
 		},
-		{
-			"checksumSHA1": "mgmkUpfdKCjiPfSjUXE7Tg2HvBw=",
-			"path": "github.com/docker/docker/pkg/namesgenerator",
-			"revision": "af626ba08a4e11b0e140e7512ac2740b09833c29",
-			"revisionTime": "2018-06-22T02:08:08Z"
-		},
 		{
 			"checksumSHA1": "wPbKObbGzS/43nrskRaJVFVEW/A=",
 			"path": "github.com/ema/qdisc",
@@ -338,6 +332,12 @@
 			"revision": "9520e82c474b0a04dd04f8a40959027271bab992",
 			"revisionTime": "2017-02-06T15:57:36Z"
 		},
+		{
+			"checksumSHA1": "V014kTJJ4zUYgCOYkq/aKBW1bDA=",
+			"path": "github.com/moby/moby/pkg/namesgenerator",
+			"revision": "8e610b2b55bfd1bfa9436ab110d311f5e8a74dcb",
+			"revisionTime": "2018-06-25T18:44:42Z"
+		},
 		{
 			"checksumSHA1": "ZTcgWKWHsrX0RXYVXn5Xeb8Q0go=",
 			"path": "github.com/modern-go/concurrent",