16535: Merge branch 'master'
authorTom Clegg <tom@tomclegg.ca>
Tue, 18 Aug 2020 20:02:56 +0000 (16:02 -0400)
committerTom Clegg <tom@tomclegg.ca>
Tue, 18 Aug 2020 20:02:56 +0000 (16:02 -0400)
commit865e5c1e3730117870eb1e485d553383626b882f
treed0475465351a9c107aa8b9d576f3428d0769c99e
parent1e3dd8e200238aeb466fe79e62cb4c876bd1373e
parent99e8567b4130771caabcf9b735bfbdb3585bd018
16535: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
lib/config/config.default.yml
lib/config/generated_config.go
sdk/go/arvados/config.go
sdk/go/arvados/fs_project_test.go
sdk/go/arvados/fs_site_test.go