Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: f08d518aa0bfee1ba3d3da1cca410eee77446534 https://github.com/galaxyproject/galaxy/commit/f08d518aa0bfee1ba3d3da1cca410... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M lib/galaxy/jobs/runners/__init__.py Log Message: ----------- Use fixed path to sync like in dev. It keeps picking up something else on my PATH and breaking my tests when I switch to release_15.10. Commit: f34d70101910dcdd6d699dc1f8688f69ea6d97cf https://github.com/galaxyproject/galaxy/commit/f34d70101910dcdd6d699dc1f8688... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M lib/galaxy/jobs/runners/__init__.py Log Message: ----------- Merge pull request #1242 from jmchilton/sync_path [15.10] Use fixed path to sync like in dev. Commit: e186b6a0cfeada4d7852d4661530dec30f73685f https://github.com/galaxyproject/galaxy/commit/e186b6a0cfeada4d7852d4661530d... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M lib/galaxy/model/tool_shed_install/__init__.py Log Message: ----------- Fix for getting shed_config_dict when an old/invalid shed_config_filename has been stored. Fixes issue updating repositories that have had shed_tool_conf.xml changed since installation. Commit: 7d4eac1535fcdc46bea5e407ca74902128dbee18 https://github.com/galaxyproject/galaxy/commit/7d4eac1535fcdc46bea5e407ca749... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-05 (Sat, 05 Dec 2015) Changed paths: M lib/galaxy/model/tool_shed_install/__init__.py Log Message: ----------- Merge pull request #1245 from blankenberg/shed_update_moved_config [15.10] Fix for getting shed_config_dict when an old/invalid shed_config_filename has been stored. Commit: bcf8ddfbd0a966fd3d6fad157f8ca87702e9c61a https://github.com/galaxyproject/galaxy/commit/bcf8ddfbd0a966fd3d6fad157f8ca... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M lib/galaxy/model/tool_shed_install/__init__.py Log Message: ----------- Merge branch 'master' into dev Conflicts: lib/galaxy/jobs/runners/__init__.py Compare: https://github.com/galaxyproject/galaxy/compare/01a919ce6a7c...bcf8ddfbd0a9