13994: Merge branch 'master' into 13994-proxy-remote
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 18 Sep 2018 19:40:26 +0000 (15:40 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 18 Sep 2018 19:40:26 +0000 (15:40 -0400)
commit18b51f2620505d4efbc9de322e24d5218a5ca19b
tree3b7faf682261334c96d0b44e81f52160fa4bea67
parentd9224c40587a8d3617e7be01f3bb7f801c4b52e4
parente0ecd284c0ca1b860a8cccd3414d765dbe6164e2
13994: Merge branch 'master' into 13994-proxy-remote

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