14360: Merge branch 'master' into 14360-dispatch-cloud
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 7 Dec 2018 20:25:39 +0000 (15:25 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 7 Dec 2018 20:25:39 +0000 (15:25 -0500)
refs #14360

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

1  2 
.licenseignore
build/run-build-packages.sh

diff --cc .licenseignore
index a0127cfa30f09a986b4dad176ae9358e573209fc,83c81b2fc21ca1db86206d82c2f50cae297b9b9c..06519a98e8bc45afcebdad584198a6b6bb47bf71
@@@ -69,4 -71,4 +71,5 @@@ sdk/R/NAMESPAC
  sdk/R/.Rbuildignore
  sdk/R/ArvadosR.Rproj
  *.Rd
 +lib/dispatchcloud/test/sshkey_*
+ *.asc
Simple merge