15954: Merge branch 'master'
authorTom Clegg <tom@tomclegg.ca>
Tue, 11 Feb 2020 16:39:44 +0000 (11:39 -0500)
committerTom Clegg <tom@tomclegg.ca>
Tue, 11 Feb 2020 16:39:44 +0000 (11:39 -0500)
commitb9fd7e3f374248a61159e4750a84e38d1c48d5dd
tree36d8e9a458e3465e4cb424ff693f9f0ce9771b73
parent0446c0a3a433936985d6f46b0eab9b253ed98e80
parentb01c4372354d84bbc712d2793b07a8d5d5276b98
15954: 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