7709: Merge branch 'master' into 7709-api-rails4
authorTom Clegg <tom@curoverse.com>
Mon, 10 Apr 2017 16:37:42 +0000 (12:37 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 10 Apr 2017 16:37:42 +0000 (12:37 -0400)
commit77d9c05d89dabc9e9e9a15f46cd12c8ad61ed64e
treee98ffcdbe7417d87da5c8848732d6d4c38375928
parente1e05845b74ce70712e414830f992ce57d7a8453
parent909313b20ed5055d62113f0eea123f362869c3f4
7709: Merge branch 'master' into 7709-api-rails4

Conflicts:
services/api/app/controllers/arvados/v1/nodes_controller.rb
services/api/app/models/container_request.rb
services/api/db/structure.sql
services/api/app/controllers/arvados/v1/nodes_controller.rb
services/api/app/models/arvados_model.rb
services/api/app/models/collection.rb
services/api/db/structure.sql