Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b1d6c017d03a1202c7fbc17f4e3ec3872d8f57b4 https://github.com/galaxyproject/galaxy/commit/b1d6c017d03a1202c7fbc17f4e3ec... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M lib/galaxy/workflow/run.py M test/api/test_workflows.py Log Message: ----------- Fixes for handling delayed steps within subworkflows. With new test case to verify this fix is needed. The previous test case that was verifying collection mapping and rescheduling of subworkflows turned out to really be testing the connections with respect to the outer workflow since only the last step of the subworkflow required rescheduling iterations. This newer test case verifies the connections within the subworkflow also - in addition to re-testing the connections and mapping in the outer workflow. Commit: c8937c8929a5d582a8d8ed033e07cd38432342d3 https://github.com/galaxyproject/galaxy/commit/c8937c8929a5d582a8d8ed033e07c... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M lib/galaxy/workflow/run.py M test/api/test_workflows.py Log Message: ----------- Merge pull request #5145 from jmchilton/subworkflow_delayed_handling Fixes for handling delayed steps within subworkflows. Compare: https://github.com/galaxyproject/galaxy/compare/d042f446a4c2...c8937c8929a5