17170: Merge branch 'master'
authorTom Clegg <tom@curii.com>
Thu, 28 Jan 2021 17:04:52 +0000 (12:04 -0500)
committerTom Clegg <tom@curii.com>
Thu, 28 Jan 2021 17:04:52 +0000 (12:04 -0500)
commit77c8223f5ddd64cff2b08d0857749644c474946f
treeda0488e4bfaf73f544c2e6b68753b8443811e46e
parent0945afa5523fb45f827750e4d1700df4ff222295
parent7885ae2c39bd2e7a38943fe9a56463fb4349a5ac
17170: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
12 files changed:
lib/config/config.default.yml
lib/config/generated_config.go
lib/controller/federation/conn.go
lib/controller/handler.go
lib/controller/router/router.go
lib/controller/rpc/conn.go
lib/crunchrun/crunchrun.go
sdk/go/arvados/api.go
sdk/go/arvados/container.go
sdk/go/arvadostest/api.go
services/api/app/models/container.rb
services/api/test/unit/container_test.rb