15720: Merge branch 'master' into 15720-fed-user-list
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 25 Nov 2019 20:20:21 +0000 (15:20 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 25 Nov 2019 20:20:21 +0000 (15:20 -0500)
commit5ee93e408c0e547dfb03b2f3d039a7715126395b
tree3eb0138f8d18af8be03c2cb0da410cb3ad99ac61
parent233a2b6bd23a3e2054cfc0690f2bc06c0f9f7323
parent607d2b1190bbba7c018fcbc91e66fdb0db1ce90f
15720: Merge branch 'master' into 15720-fed-user-list

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
lib/controller/federation/conn.go
lib/controller/federation/generated.go
lib/controller/federation/list.go
lib/controller/federation/list_test.go
lib/controller/federation/login_test.go
lib/controller/router/router_test.go
lib/controller/rpc/conn.go