Merge pull request #1445 from kubernetes/vendor-1.8

Updated godeps
This commit is contained in:
Nick Sardo 2017-09-29 13:33:42 -07:00 committed by GitHub
commit cbfb619ca7
1115 changed files with 160957 additions and 262847 deletions

View file

@ -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.