16625: Merge branch 'master' into 16625-add-azure-managed-image-support
authorWard Vandewege <ward@curii.com>
Thu, 20 Aug 2020 14:28:09 +0000 (10:28 -0400)
committerWard Vandewege <ward@curii.com>
Thu, 20 Aug 2020 14:28:30 +0000 (10:28 -0400)
commitee908b109a95ea962425b435a8a317231829b115
treeb1899562ce2ab8fb57bb6160e7b908956b441184
parent91ce664427d1ba915230dde3bc14163b57342af6
parentc8f84a3c4a4f589afaa0bfa1dcc65be9c23e62e6
16625: Merge branch 'master' into 16625-add-azure-managed-image-support

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
lib/config/config.default.yml
lib/config/generated_config.go