Merge branch 'master' into 3036-collection-uuids
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 22 Aug 2014 20:14:03 +0000 (16:14 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 22 Aug 2014 20:14:03 +0000 (16:14 -0400)
commit8f46cb4ad6974b0fc54acc9c9f16fbea7573d75d
tree62d0687fae58068d6b36dfdd809a9c282f8588da
parent68c3fbc94ecfa4115af4d6ccb95171b46432eb72
parentd68db5e4755eb38482f251fec92fa975feae667d
Merge branch 'master' into 3036-collection-uuids
services/api/app/controllers/arvados/v1/jobs_controller.rb