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)
Refs #4269.

1  2 
services/api/app/models/job.rb

Simple merge