Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ac8b5eae02155a7364e4131ba88d983c69bd000b https://github.com/galaxyproject/galaxy/commit/ac8b5eae02155a7364e4131ba88d9... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2015-09-25 (Fri, 25 Sep 2015)

Changed paths: M lib/galaxy/tools/parser/yaml.py M test/functional/tools/disambiguate_cond.xml M test/functional/tools/samples_tool_conf.xml

Log Message: ----------- Fix errors when starting "./run_tests.sh -with_framework_test_tools -api"

Commit: ba43e95f41c3220df05aac0be7bc117c6acda362 https://github.com/galaxyproject/galaxy/commit/ba43e95f41c3220df05aac0be7bc1... Author: John Chilton jmchilton@gmail.com Date: 2015-09-25 (Fri, 25 Sep 2015)

Changed paths: M lib/galaxy/tools/parser/yaml.py M test/functional/tools/disambiguate_cond.xml M test/functional/tools/samples_tool_conf.xml

Log Message: ----------- Merge pull request #800 from nsoranzo/functional_tests_fixes

Fix errors when starting "./run_tests.sh -with_framework_test_tools -api"

Compare: https://github.com/galaxyproject/galaxy/compare/3f91a9a38186...ba43e95f41c3