15759: Merge branch 'master' into 15759-deploy-crunch-run
authorTom Clegg <tom@tomclegg.ca>
Tue, 31 Dec 2019 16:34:34 +0000 (11:34 -0500)
committerTom Clegg <tom@tomclegg.ca>
Tue, 31 Dec 2019 16:34:34 +0000 (11:34 -0500)
commitdfb9598282b677ead60f91c14f5e96405735d42f
treeb219233510cbbbaf6ab41a1571443d8db21dfb3e
parentdd9367afefff5d0cd38d1549e32e2794e4614fb4
parent2544aab0e538dac2c5456307173abf35f1611e6d
15759: Merge branch 'master' into 15759-deploy-crunch-run

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