Merge branch 'master' into 3605-improved-dashboard
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 17 Sep 2014 13:13:52 +0000 (09:13 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 17 Sep 2014 13:13:52 +0000 (09:13 -0400)
commit9e2357191ca21631bcb6d8cf7a640d456a1a6cfa
tree491f12e15c4535aeaa24b4330a2de9cb6a987a58
parent0d1919c4b29f66c9af5a912f770dccce4a314e5f
parent1f1963df75f584d575fd440206e3ac64064cf06c
Merge branch 'master' into 3605-improved-dashboard

Conflicts:
apps/workbench/app/models/job.rb
services/api/app/models/job.rb
apps/workbench/app/models/job.rb
apps/workbench/app/views/pipeline_instances/show.html.erb
services/api/app/models/job.rb