14287: Merge branch 'master'
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 27 Jun 2019 14:50:58 +0000 (10:50 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Thu, 27 Jun 2019 14:50:58 +0000 (10:50 -0400)
commit231a86fd3f7e30e9f66d71d92ad7c26578637e37
treeb6467214caa0146915e75fb7cb4f3e92df7c504e
parent3a28574402bbeb5df3ea8f32f2f60a7a2f20e4fa
parent10d70a1c08984a699ac3f6b893fe6d2141c5ad9e
14287: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
build/run-tests.sh
lib/config/config.default.yml
lib/config/export.go
lib/config/generated_config.go
sdk/go/arvados/config.go
services/api/app/models/collection.rb
services/api/test/unit/collection_test.rb