Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b93b62ae778905518a5c0d7703cc3e93f2c2ba02 https://github.com/galaxyproject/galaxy/commit/b93b62ae778905518a5c0d7703cc3... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2016-04-13 (Wed, 13 Apr 2016)

Changed paths: M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh

Log Message: ----------- Place $headers before integrity_check

PBS needs the resource selection (which will be filled in using $headers) to appear before anything else (except the shebang), so this changes the order.

Commit: e81448c62ab5f78d1519826cc7567aa24b476d82 https://github.com/galaxyproject/galaxy/commit/e81448c62ab5f78d1519826cc7567... Author: John Chilton jmchilton@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh

Log Message: ----------- Merge pull request #2146 from mvdbeek/reorder_job_template

Place $headers before integrity_check

Compare: https://github.com/galaxyproject/galaxy/compare/a919e98be3ee...e81448c62ab5