From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 7 Dec 2018 20:25:39 +0000 (-0500)
Subject: 14360: Merge branch 'master' into 14360-dispatch-cloud
X-Git-Tag: 1.4.0~180^2~26
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/cc952178056bf6d29471f6986306fb673dcf394a

14360: Merge branch 'master' into 14360-dispatch-cloud

refs #14360

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

cc952178056bf6d29471f6986306fb673dcf394a
diff --cc .licenseignore
index a0127cfa30,83c81b2fc2..06519a98e8
--- a/.licenseignore
+++ b/.licenseignore
@@@ -69,4 -71,4 +71,5 @@@ sdk/R/NAMESPAC
  sdk/R/.Rbuildignore
  sdk/R/ArvadosR.Rproj
  *.Rd
 +lib/dispatchcloud/test/sshkey_*
+ *.asc