[ARVADOS] updated: 1.3.0-1910-ge087a6088

[Git user]

Summary of changes:
 lib/controller/federation/generated.go | 12 ++++++++++++
 lib/controller/federation/list.go      |  6 ++++++
 lib/controller/federation/list_test.go |  2 +-
 lib/controller/router/router_test.go   |  7 +++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

       via  e087a608834328786d0aec7956646fdf63b5ed44 (commit)
       via  0e2a467a923bd490f3e1dc4d8c00a9e2f29e59d4 (commit)
       via  92d7d779d4f0415d09f536d286972bd953e7b566 (commit)
      from  7737b743baed690e98882a1bb3e44d1a76e45030 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e087a608834328786d0aec7956646fdf63b5ed44
Merge: 7737b743b 0e2a467a9
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Nov 22 14:04:52 2019 -0500

    Merge branch '15851-empty-items-array'
    
    fixes #15851
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 0e2a467a923bd490f3e1dc4d8c00a9e2f29e59d4
Merge: 92d7d779d 7737b743b
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Nov 22 14:04:27 2019 -0500

    15851: Merge branch 'master' into 15851-empty-items-array
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --cc lib/controller/federation/generated.go
index 2e6eda7ff,caf454e9a..fb91a8496
--- a/lib/controller/federation/generated.go
+++ b/lib/controller/federation/generated.go
@@@ -37,13 -41,13 +41,19 @@@ func (conn *Conn) ContainerList(ctx con
  		}
  		return uuids, nil
  	})
- 	sort.Slice(merged.Items, func(i, j int) bool { return merged.Items[i].UUID < merged.Items[j].UUID })
+ 	if needSort.Load().(bool) {
+ 		// Apply the default/implied order, "modified_at desc"
+ 		sort.Slice(merged.Items, func(i, j int) bool {
+ 			mi, mj := merged.Items[i].ModifiedAt, merged.Items[j].ModifiedAt
+ 			return mj.Before(mi)
+ 		})
+ 	}
 +	if merged.Items == nil {
 +		// Return empty results as [], not null
 +		// (https://github.com/golang/go/issues/27589 might be
 +		// a better solution in the future)
 +		merged.Items = []arvados.Container{}
 +	}
  	return merged, err
  }
  
@@@ -68,12 -75,12 +81,18 @@@ func (conn *Conn) SpecimenList(ctx cont
  		}
  		return uuids, nil
  	})
- 	sort.Slice(merged.Items, func(i, j int) bool { return merged.Items[i].UUID < merged.Items[j].UUID })
+ 	if needSort.Load().(bool) {
+ 		// Apply the default/implied order, "modified_at desc"
+ 		sort.Slice(merged.Items, func(i, j int) bool {
+ 			mi, mj := merged.Items[i].ModifiedAt, merged.Items[j].ModifiedAt
+ 			return mj.Before(mi)
+ 		})
+ 	}
 +	if merged.Items == nil {
 +		// Return empty results as [], not null
 +		// (https://github.com/golang/go/issues/27589 might be
 +		// a better solution in the future)
 +		merged.Items = []arvados.Specimen{}
 +	}
  	return merged, err
  }
diff --cc lib/controller/federation/list.go
index 0c6bef497,4bd32fac2..54f59812a
--- a/lib/controller/federation/list.go
+++ b/lib/controller/federation/list.go
@@@ -41,13 -45,13 +45,19 @@@ func (conn *Conn) CollectionList(ctx co
  		}
  		return uuids, nil
  	})
- 	sort.Slice(merged.Items, func(i, j int) bool { return merged.Items[i].UUID < merged.Items[j].UUID })
+ 	if needSort.Load().(bool) {
+ 		// Apply the default/implied order, "modified_at desc"
+ 		sort.Slice(merged.Items, func(i, j int) bool {
+ 			mi, mj := merged.Items[i].ModifiedAt, merged.Items[j].ModifiedAt
+ 			return mj.Before(mi)
+ 		})
+ 	}
 +	if merged.Items == nil {
 +		// Return empty results as [], not null
 +		// (https://github.com/golang/go/issues/27589 might be
 +		// a better solution in the future)
 +		merged.Items = []arvados.Collection{}
 +	}
  	return merged, err
  }
  

-----------------------------------------------------------------------


hooks/post-receive
--