Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: 55677f2d3db723c023540b8d640563a9f3ca04c5 https://github.com/galaxyproject/galaxy/commit/55677f2d3db723c023540b8d64056... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-13 (Wed, 13 Jan 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh M lib/galaxy/jobs/runners/util/job_script/__init__.py M test/unit/jobs/test_command_factory.py Log Message: ----------- Fix to ensure integrity of tool_script.sh also. Previously the job script underwent these checks and I had assumed since that got written later it would never be the case that tool_script.sh wouldn't be synchronized by the job script was - turns out file systems are more creative and less logical than one might expected. Also increases the count for the number of syncs that will execute because 15 on rare occasion proved not to be enough as well as making both the count and sleep time configurable. Commit: 2e62388b2f34ad83f215bb3eff4c6ae5b1efd7b7 https://github.com/galaxyproject/galaxy/commit/2e62388b2f34ad83f215bb3eff4c6... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-01-14 (Thu, 14 Jan 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh M lib/galaxy/jobs/runners/util/job_script/__init__.py M test/unit/jobs/test_command_factory.py Log Message: ----------- Merge pull request #1494 from jmchilton/tool_command_integrity [16.01] Fix to ensure integrity of tool_script.sh also. Compare: https://github.com/galaxyproject/galaxy/compare/9d52a4a31dd9...2e62388b2f34