TrueCloudLab
/
distribution
13
0
Fork 3
Code Issues 2 Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #578 from gierschv/driver-rados 

Fix rados build, remove uuid dependency
pull/580/head
Stephen Day 2015-06-01 13:20:33 -07:00
parent 3073b1d9e5 3c9a2a9bac
commit 4449eba4b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
registry/storage/driver/rados/rados.go
View File

@ -9,12 +9,12 @@ import (
"path"
"strconv"
"code.google.com/p/go-uuid/uuid"
log "github.com/Sirupsen/logrus"
"github.com/docker/distribution/context"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/registry/storage/driver/factory"
"github.com/docker/distribution/uuid"
"github.com/noahdesu/go-ceph/rados"
)
@ -497,7 +497,7 @@ func (d *driver) URLFor(ctx context.Context, path string, options map[string]int
// Generate a blob identifier
func (d *driver) generateOid() string {
return objectBlobPrefix + uuid.New()
return objectBlobPrefix + uuid.Generate().String()
}
// Reference a object and its hierarchy