Merge remote-tracking branch 'origin/master' into 2882-job-process-stats
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 4 Jun 2014 19:23:31 +0000 (15:23 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 4 Jun 2014 19:23:31 +0000 (15:23 -0400)
commitbf7687829f5222375441cf75c7d82d82a4f508c4
tree9005163079b4e889aca3813c5d3dd224255cba30
parent137cd3ce818d4789355ea8d92cd2e2ea73318c4f
parent06750c636edc78256a11aec392be21d63a0cceeb
Merge remote-tracking branch 'origin/master' into 2882-job-process-stats
services/api/app/models/job.rb