16347: Merge branch 'main'
authorTom Clegg <tom@curii.com>
Wed, 27 Oct 2021 18:12:56 +0000 (14:12 -0400)
committerTom Clegg <tom@curii.com>
Wed, 27 Oct 2021 18:12:56 +0000 (14:12 -0400)
commit623ffe7320d0a159ba9a5912fc1948cac12ad505
treedaf04d5b78e326040125c7869d565e1a18cc6806
parent68259bcde57277cb709296fc24e86826d9c131d5
parentaaabfc20e05a635a36be0049b38b2034f041398d
16347: Merge branch 'main'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
lib/config/config.default.yml
lib/config/generated_config.go
lib/crunchrun/crunchrun.go