Merge pull request #1445 from kubernetes/vendor-1.8

Updated godeps
kubernetes · Sep 29, 2017 · cbfb619 · cbfb619
2 parents c78b2b8 + ebfaf19
commit cbfb619
Show file tree

Hide file tree

Showing 1,115 changed files with 176,685 additions and 278,575 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/controllers/gce/controller/utils.go b/controllers/gce/controller/utils.go
@@ -668,10 +668,10 @@ func (o PodsByCreationTimestamp) Len() int      { return len(o) }
 func (o PodsByCreationTimestamp) Swap(i, j int) { o[i], o[j] = o[j], o[i] }
 
 func (o PodsByCreationTimestamp) Less(i, j int) bool {
-	if o[i].CreationTimestamp.Equal(o[j].CreationTimestamp) {
+	if o[i].CreationTimestamp.Equal(&o[j].CreationTimestamp) {
 		return o[i].Name < o[j].Name
 	}
-	return o[i].CreationTimestamp.Before(o[j].CreationTimestamp)
+	return o[i].CreationTimestamp.Before(&o[j].CreationTimestamp)
 }
 
 // setInstanceGroupsAnnotation sets the instance-groups annotation with names of the given instance groups.

diff --git a/vendor/github.com/docker/distribution/AUTHORS b/vendor/github.com/docker/distribution/AUTHORS
diff --git a/...hub.com/docker/distribution/digest/set.go → ....com/docker/distribution/digestset/set.go b/...hub.com/docker/distribution/digest/set.go → ....com/docker/distribution/digestset/set.go
diff --git a/vendor/github.com/docker/distribution/reference/helpers.go b/vendor/github.com/docker/distribution/reference/helpers.go