Merge pull request #12238 from eparis/godeps

Auto commit by PR queue bot

contrib/mesos/pkg/scheduler/podtask/pod_task.go

@@ -21,13 +21,13 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/go-uuid/uuid"
 	"github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers"
 	annotation "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/meta"
 	"github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/metrics"
 	mresource "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/resource"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/gogo/protobuf/proto"
+	"github.com/pborman/uuid"
 
 	log "github.com/golang/glog"
 	mesos "github.com/mesos/mesos-go/mesosproto"

contrib/mesos/pkg/scheduler/uid/uid.go

@@ -21,8 +21,8 @@ import (
 	"strconv"
 	"strings"
 
-	"code.google.com/p/go-uuid/uuid"
 	log "github.com/golang/glog"
+	"github.com/pborman/uuid"
 )
 
 type UID struct {