Merge branch '11017-docker-migration'
authorTom Clegg <tom@curoverse.com>
Thu, 16 Feb 2017 15:17:34 +0000 (10:17 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 16 Feb 2017 15:17:34 +0000 (10:17 -0500)
commit5624fec61db977d386ce03ca333241c74ca251b5
treeecc390b6dbc56f1ec29e5255b7ba76627776c29d
parent4edf67aee4e8d4b351ee08bcb19c051a9bddeacd
parente86743ca1a4e1431d6d8417083ef1a56461b45e9
Merge branch '11017-docker-migration'

closes #11017
services/api/app/models/job.rb
services/api/test/unit/job_test.rb