Merge remote-tracking branch 'origin/master' into 3899-crunch-use-job-state
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 26 Sep 2014 13:01:22 +0000 (09:01 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 26 Sep 2014 13:01:22 +0000 (09:01 -0400)
commita3787ef83a0538097fb6f802f675be740a241ebc
treedb7c09a3d5f213365ec2c1825ab4fc908e7cbd95
parentce410ef35e137e040ace097a74a33f04c5975ad9
parentc491bfd795b7c7c4f26f18003290bd7ec9e88d60
Merge remote-tracking branch 'origin/master' into 3899-crunch-use-job-state
services/api/app/models/job.rb
services/api/script/crunch-dispatch.rb