Merge branch '15286-fixes'
authorWard Vandewege <wvandewege@veritasgenetics.com>
Mon, 3 Jun 2019 20:51:19 +0000 (16:51 -0400)
committerWard Vandewege <wvandewege@veritasgenetics.com>
Mon, 3 Jun 2019 20:55:38 +0000 (16:55 -0400)
commitd56b21609ddd2e2e096f5c30e991d24aa213f7f4
tree80e9da72c762479aa420e07ff0b637b2c8cd16d6
parentc792e4991e1d77620d61efaa2600a93d75227f06
parent1a18a29729f91dd23f89387f5277c91607376fd9
Merge branch '15286-fixes'

Fixes from the 1.4 branch.

refs #15286

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>