projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4edf67a e86743c)
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)
closes #11017

1  2 
services/api/app/models/job.rb patch | diff1 | diff2 | blob | history
services/api/test/unit/job_test.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/app/models/job.rb
Simple merge
diff --cc services/api/test/unit/job_test.rb
Simple merge