Merge pull request #12238 from eparis/godeps

Auto commit by PR queue bot
2015-08-05 01:06:11 -07:00
parent f75252a6b1 a29789d60e
commit 159ba48932
38 changed files with 23178 additions and 11125 deletions
--- a/pkg/util/uuid.go
+++ b/pkg/util/uuid.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"

-	"code.google.com/p/go-uuid/uuid"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
+	"github.com/pborman/uuid"
 )

 var uuidLock sync.Mutex