Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: f78756cb79f294689227e0222c8b75f3100047b5 https://github.com/galaxyproject/galaxy/commit/f78756cb79f294689227e0222c8b7... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M lib/galaxy/tools/cwl/cwltool_deps.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Fix a few problems discovered through planemo. Including 'TypeError: _get_config_option() got multiple values for keyword argument 'prefix' and problem when planemo's cwltool is installed in Galaxy's virtualenv. Commit: 1dac5f3bb63f7b34e7a84ae79d3eb60089712d0b https://github.com/galaxyproject/galaxy/commit/1dac5f3bb63f7b34e7a84ae79d3eb... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-01-14 (Thu, 14 Jan 2016) Changed paths: M lib/galaxy/tools/cwl/cwltool_deps.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #1502 from jmchilton/planemo_fix [16.01] Fix a few problems discovered through planemo. Compare: https://github.com/galaxyproject/galaxy/compare/7de3bcdd7e4e...1dac5f3bb63f