4084: Merge branch 'master' into 4084-log-pane-refresh-TC
authorTom Clegg <tom@curoverse.com>
Wed, 5 Nov 2014 04:28:22 +0000 (23:28 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 5 Nov 2014 04:28:22 +0000 (23:28 -0500)
commit95d1231a25637c5ba0fd07b116876b17711ec201
tree18e1fca5ef40d44da9929899d910cb40c40da1a0
parentf075cec933827186d93d5d16ab5ab6803b31d40d
parentd5cf000ee76060ce5e96bb4032f54e7f6b19116e
4084: Merge branch 'master' into 4084-log-pane-refresh-TC

Conflicts:
services/api/test/fixtures/jobs.yml
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/views/pipeline_instances/_running_component.html.erb
apps/workbench/test/test_helper.rb
services/api/test/fixtures/jobs.yml