11453: Merge branch 'master' into 11453-federated-tokens
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 7 Dec 2017 16:42:07 +0000 (11:42 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Thu, 7 Dec 2017 16:42:07 +0000 (11:42 -0500)
commite5de95c8d7040a2810238e069dd18403765ce056
tree829de56f60a2a3e4b8bb212f522806784e98b9e6
parentae36f78143f258c4eecbee623efb2c2bfcd303a8
parentee8558ddd313b037e94f3342cee304f8bd3e5e66
11453: Merge branch 'master' into 11453-federated-tokens

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
build/run-tests.sh
services/api/app/controllers/arvados/v1/schema_controller.rb
services/api/config/application.default.yml