Update go-uuid dependency
There don't seem to be any major changes but we'll update this while we're at it. This dependency is pretty important for coming changes. Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
parent
10a194c775
commit
29135602ec
4 changed files with 11 additions and 11 deletions
6
Godeps/Godeps.json
generated
6
Godeps/Godeps.json
generated
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"ImportPath": "github.com/docker/distribution",
|
||||
"GoVersion": "go1.4",
|
||||
"GoVersion": "go1.4.1",
|
||||
"Packages": [
|
||||
"./..."
|
||||
],
|
||||
"Deps": [
|
||||
{
|
||||
"ImportPath": "code.google.com/p/go-uuid/uuid",
|
||||
"Comment": "null-12",
|
||||
"Rev": "7dda39b2e7d5e265014674c5af696ba4186679e9"
|
||||
"Comment": "null-15",
|
||||
"Rev": "35bc42037350f0078e3c974c6ea690f1926603ab"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/AdRoll/goamz/aws",
|
||||
|
|
2
Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/LICENSE
generated
vendored
2
Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/LICENSE
generated
vendored
|
@ -1,4 +1,4 @@
|
|||
Copyright (c) 2009 Google Inc. All rights reserved.
|
||||
Copyright (c) 2009,2014 Google Inc. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
|
|
10
Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/time.go
generated
vendored
10
Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/time.go
generated
vendored
|
@ -40,15 +40,15 @@ func (t Time) UnixTime() (sec, nsec int64) {
|
|||
}
|
||||
|
||||
// GetTime returns the current Time (100s of nanoseconds since 15 Oct 1582) and
|
||||
// adjusts the clock sequence as needed. An error is returned if the current
|
||||
// time cannot be determined.
|
||||
func GetTime() (Time, error) {
|
||||
// clock sequence as well as adjusting the clock sequence as needed. An error
|
||||
// is returned if the current time cannot be determined.
|
||||
func GetTime() (Time, uint16, error) {
|
||||
defer mu.Unlock()
|
||||
mu.Lock()
|
||||
return getTime()
|
||||
}
|
||||
|
||||
func getTime() (Time, error) {
|
||||
func getTime() (Time, uint16, error) {
|
||||
t := timeNow()
|
||||
|
||||
// If we don't have a clock sequence already, set one.
|
||||
|
@ -63,7 +63,7 @@ func getTime() (Time, error) {
|
|||
clock_seq = ((clock_seq + 1) & 0x3fff) | 0x8000
|
||||
}
|
||||
lasttime = now
|
||||
return Time(now), nil
|
||||
return Time(now), clock_seq, nil
|
||||
}
|
||||
|
||||
// ClockSequence returns the current clock sequence, generating one if not
|
||||
|
|
4
Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version1.go
generated
vendored
4
Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version1.go
generated
vendored
|
@ -19,7 +19,7 @@ func NewUUID() UUID {
|
|||
SetNodeInterface("")
|
||||
}
|
||||
|
||||
now, err := GetTime()
|
||||
now, seq, err := GetTime()
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
|
@ -34,7 +34,7 @@ func NewUUID() UUID {
|
|||
binary.BigEndian.PutUint32(uuid[0:], time_low)
|
||||
binary.BigEndian.PutUint16(uuid[4:], time_mid)
|
||||
binary.BigEndian.PutUint16(uuid[6:], time_hi)
|
||||
binary.BigEndian.PutUint16(uuid[8:], clock_seq)
|
||||
binary.BigEndian.PutUint16(uuid[8:], seq)
|
||||
copy(uuid[10:], nodeID)
|
||||
|
||||
return uuid
|
||||
|
|
Loading…
Reference in a new issue