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)
commit31e1d10eb4a54b13f55b3c9638f46032be633ff9
tree0ac515d176cd9c09eb02398992f818b94d29a4ab
parentab874e9d6cd3313ce827dc4d4d574913575ad095
parent2d244defaaa4f5f663a5ac11cf507d7203f704e3
Merge remote-tracking branch 'origin/master' into 4084-log-pane-refresh
apps/workbench/app/controllers/pipeline_instances_controller.rb
services/api/config/application.default.yml
services/api/test/fixtures/jobs.yml