Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: 47361f12ecaad83d5d563be763320ae1b17edc3b https://github.com/galaxyproject/galaxy/commit/47361f12ecaad83d5d563be763320... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-01-08 (Fri, 08 Jan 2016) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/tools/toolbox/base.py Log Message: ----------- Reduce code duplication by reusing get_installed_repository() function. Conflicts: lib/galaxy/tools/toolbox/base.py Commit: e8e01bdfb19cf1cc8f8cf485762c68d3f8e2f352 https://github.com/galaxyproject/galaxy/commit/e8e01bdfb19cf1cc8f8cf485762c6... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-01-08 (Fri, 08 Jan 2016) Changed paths: M lib/galaxy/tools/toolbox/base.py Log Message: ----------- When loading a tool from Tool Shed, check that the <installed_changeset_revision> element matches the tool path. Workaround for issue #1283, which causes the loaded tool to have a StockLineage instead of a ToolShedLineage, thus creating multiple entries for the tool in the panel. Conflicts: lib/galaxy/tools/toolbox/base.py Commit: bb8f0f75efb971471fa65c2cc6951bfaa00b0fd0 https://github.com/galaxyproject/galaxy/commit/bb8f0f75efb971471fa65c2cc6951... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-08 (Fri, 08 Jan 2016) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/tools/toolbox/base.py Log Message: ----------- Merge pull request #1455 from jmchilton/release_16.01_merge_1 [16.01] Merge #1314 forward into 16.01. Compare: https://github.com/galaxyproject/galaxy/compare/e36d33ce74ba...bb8f0f75efb9