13752: Merge branch 'master' into 13752-migrate-index-data
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 18 Sep 2018 19:43:28 +0000 (15:43 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 18 Sep 2018 19:43:28 +0000 (15:43 -0400)
commitce4285dd9a6310a799b861237918273329390316
tree37413118067f2399af6e45c6ce767e663c5905e4
parentaf1125bd1bc10f6ac2f9129261176c4510aadd54
parent8c30c649c667f7ccd205cdfcf1864563ac503585
13752: Merge branch 'master' into 13752-migrate-index-data

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
services/api/app/models/collection.rb