Merge branch 'master' into 12033-multisite-search
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 18 Aug 2017 19:54:20 +0000 (15:54 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 18 Aug 2017 19:54:20 +0000 (15:54 -0400)
commit65f13986f98a75f8da7cfe695ea5960ff741d402
tree77d783f417d23fe205a94082ff869b15d4bd8b9d
parent3bd6273f572ae49e1ed1b03f160d509b17335bdf
parent466e71eb74d1323dc79c8db68d74c5e31e789652
Merge branch 'master' into 12033-multisite-search

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