Branch: refs/heads/release_15.10 Home: https://github.com/galaxyproject/galaxy Commit: 05f3da308d6a58dc8528f317fa6ea4ffa1fb7610 https://github.com/galaxyproject/galaxy/commit/05f3da308d6a58dc8528f317fa6ea... Author: John Chilton <jmchilton@gmail.com> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/util/xml_macros.py M test/unit/tools/test_tool_loader.py Log Message: ----------- Fix macro bug with empty CDATA being None instead of ''. Fixes galaxyproject/planemo#362 thanks for the report @erasche. Test using the following command: ``` nosetests test/unit/tools/test_tool_loader.py ``` Commit: eb16ba3743a7e42cc9ad43f0d7a3eb926ba60cd8 https://github.com/galaxyproject/galaxy/commit/eb16ba3743a7e42cc9ad43f0d7a3e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/util/xml_macros.py M test/unit/tools/test_tool_loader.py Log Message: ----------- Merge pull request #1122 from jmchilton/empty_cdata_macro [15.10] Fix macro bug with empty CDATA being None instead of ''. Compare: https://github.com/galaxyproject/galaxy/compare/73f46f4e0814...eb16ba3743a7