Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d13fc00a7446ff8c444cc89c0d7b8668d2147e09 https://github.com/galaxyproject/galaxy/commit/d13fc00a7446ff8c444cc89c0d7b8... Author: Oleksandr Moskalenko <om@rc.ufl.edu> Date: 2018-04-12 (Thu, 12 Apr 2018) Changed paths: M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh Log Message: ----------- Move the statement below _galaxy_setup_environment to ensure that custom PATH to a non-system SLURM install will be applied if set in environment_setup_file Commit: 225f6af3c07b44a672ac0571f57cf7c5766a3056 https://github.com/galaxyproject/galaxy/commit/225f6af3c07b44a672ac0571f57cf... Author: Dannon <dannon.baker@gmail.com> Date: 2018-04-13 (Fri, 13 Apr 2018) Changed paths: M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh Log Message: ----------- Merge pull request #5880 from moskalenko/dev Move the memory statement below _galaxy_setup_environment Compare: https://github.com/galaxyproject/galaxy/compare/e91163a9fcc9...225f6af3c07b