Merge branch 'master' into 14716-webdav-cluster-config
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 12 Aug 2019 20:47:26 +0000 (17:47 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 12 Aug 2019 20:47:26 +0000 (17:47 -0300)
commit8b873a9b3b8865a4d451263e48b49122b9c32759
tree34aaeed143a8ea21e08c3f97ab0aa40065e0e716
parentc8f57c52224362d7621f1271774b0f2d60c55cac
parent415910149bed2eef6ae818b7c059d413934df06e
Merge branch 'master' into 14716-webdav-cluster-config

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
apps/workbench/test/integration/jobs_test.rb
doc/admin/upgrading.html.textile.liquid
lib/config/config.default.yml
lib/config/export.go
lib/config/generated_config.go
sdk/go/arvados/config.go