Merge branch 'master' into 8703-job-components
authorradhika <radhika@curoverse.com>
Tue, 29 Mar 2016 15:54:01 +0000 (11:54 -0400)
committerradhika <radhika@curoverse.com>
Tue, 29 Mar 2016 15:54:01 +0000 (11:54 -0400)
commit98036435a54261258faadedeef0675eecfe4ff39
treef52dd31b17dc726b795ecf005b0f49dbab101d9a
parent7a6612d56b719165d3aff84754521c9a38d9912a
parentf2f5c6aa8117b51e9fed1a59a41b97b18ac713a8
Merge branch 'master' into 8703-job-components
services/api/app/controllers/arvados/v1/jobs_controller.rb
services/api/app/models/job.rb