Merge branch '4269-no-collection-uuid-in-script-params'
authorTim Pierce <twp@curoverse.com>
Mon, 8 Dec 2014 22:02:33 +0000 (17:02 -0500)
committerTim Pierce <twp@curoverse.com>
Mon, 8 Dec 2014 22:02:33 +0000 (17:02 -0500)
commitb09686ba2ad8fedb5147a632c6edc3e68cdad171
tree2e7726254eb17ffa19730a66e170a2ededf56d1b
parentc3695bc7282996d66fb1922d7971aa86fb497968
parent050277d9f11f275fb8c2750e5e267e40da36d76a
Merge branch '4269-no-collection-uuid-in-script-params'

Refs #4269.
services/api/app/models/job.rb