16480: Merge branch 'master'
authorTom Clegg <tom@tomclegg.ca>
Mon, 22 Jun 2020 15:35:35 +0000 (11:35 -0400)
committerTom Clegg <tom@tomclegg.ca>
Mon, 22 Jun 2020 15:35:35 +0000 (11:35 -0400)
commitb96d5caa0056472fe67b82bd5305448d85c7d0cd
tree135400dbdac8ec60fbf26f3c5a041fae81b19e74
parentfd080b34a321cbd6593d69f427b9eaeab890712f
parentd278c2185e97251be72c9bbd58908d574932dbde
16480: Merge branch 'master'

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