14360: Merge branch 'master' into 14360-dispatch-cloud
[arvados.git] / .licenseignore
index a0127cfa30f09a986b4dad176ae9358e573209fc..06519a98e8bc45afcebdad584198a6b6bb47bf71 100644 (file)
@@ -13,6 +13,7 @@ build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados
 *by-sa-3.0.txt
 *COPYING
 doc/fonts/*
+doc/user/cwl/federated/*
 */docker_image
 docker/jobs/apt.arvados.org.list
 */en.bootstrap.yml
@@ -46,6 +47,7 @@ docker/jobs/apt.arvados.org.list
 */script/rails
 sdk/cwl/tests/input/blorp.txt
 sdk/cwl/tests/tool/blub.txt
+sdk/cwl/tests/federation/data/*
 sdk/go/manifest/testdata/*_manifest
 sdk/java/.classpath
 sdk/java/pom.xml
@@ -70,3 +72,4 @@ sdk/R/.Rbuildignore
 sdk/R/ArvadosR.Rproj
 *.Rd
 lib/dispatchcloud/test/sshkey_*
+*.asc