Merge remote-tracking branch 'origin/master' into 4031-fix-graph-connections
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 3 Nov 2014 20:07:10 +0000 (15:07 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 3 Nov 2014 20:07:10 +0000 (15:07 -0500)
commit5dd7bd8a05d52838b1cb8df7b341a843abae7a0a
treef9742d2b3249b9f17d95b5a4f26a7a155def5d9d
parent15dbb3110b3b7cc6712e58bdfbb9a5df7fab1882
parent3978e8ae9c1b5bbc07c63fd062e189a81e52399c
Merge remote-tracking branch 'origin/master' into 4031-fix-graph-connections

Conflicts:
services/api/test/fixtures/collections.yml
apps/workbench/app/controllers/pipeline_instances_controller.rb
apps/workbench/test/integration/pipeline_instances_test.rb
services/api/test/fixtures/collections.yml
services/api/test/fixtures/jobs.yml