Branch: refs/heads/release_15.07 Home: https://github.com/galaxyproject/galaxy Commit: dc6700eec50f679f5d344eeaf8c0641f8869c6c4 https://github.com/galaxyproject/galaxy/commit/dc6700eec50f679f5d344eeaf8c06... Author: John Chilton jmchilton@gmail.com Date: 2015-08-25 (Tue, 25 Aug 2015)

Changed paths: M lib/galaxy/util/xml_macros.py M test/unit/tools/test_tool_loader.py

Log Message: ----------- Fix yield statements at the top level of macros.

Fixes #647.

Commit: 71125326f842860b163b889b514cf10036915ca7 https://github.com/galaxyproject/galaxy/commit/71125326f842860b163b889b514cf... Author: Eric Rasche rasche.eric@gmail.com Date: 2015-08-25 (Tue, 25 Aug 2015)

Changed paths: M lib/galaxy/util/xml_macros.py M test/unit/tools/test_tool_loader.py

Log Message: ----------- Merge pull request #649 from jmchilton/yield_at_top_level

[15.07] Fix yield statements at the top level of macros.

Compare: https://github.com/galaxyproject/galaxy/compare/a3a209b8a001...71125326f842