projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab874e9 2d244de)
Merge remote-tracking branch 'origin/master' into 4084-log-pane-refresh
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 28 Oct 2014 19:36:48 +0000 (15:36 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 28 Oct 2014 19:36:48 +0000 (15:36 -0400)
1  2 
apps/workbench/app/controllers/pipeline_instances_controller.rb patch | diff1 | diff2 | blob | history
services/api/config/application.default.yml patch | diff1 | diff2 | blob | history
services/api/test/fixtures/jobs.yml patch | diff1 | diff2 | blob | history

diff --cc services/api/test/fixtures/jobs.yml
Simple merge