14807: Merge branch 'master'
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 20 Feb 2019 16:49:18 +0000 (11:49 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 20 Feb 2019 16:49:18 +0000 (11:49 -0500)
commitd97388bdbfeb6a43cb86996012a1db0ba4a8871f
treebae2683fe5e301c5338bffccb5c2d63391badbee
parentf2e8b80d3a3e98417e4e56f7069176a9b88eacbc
parent9acc7690b9c734b7e31476ce66ef668bf7eb4bbf
14807: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
lib/controller/federation_test.go
services/api/app/models/container.rb
services/api/test/unit/container_test.rb