Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: a9280649b201dc8c1ce6e1601c5baaae211acbd7 https://github.com/galaxyproject/galaxy/commit/a9280649b201dc8c1ce6e1601c5ba... Author: John Chilton <jmchilton@gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py Log Message: ----------- Sync job_script module with Pulsar to fix doctest. Following test fails without this change and is fixed by it. ``` nosetests --with-doctest lib/galaxy/jobs/runners/util/job_script ``` I'm not sure why Travis doesn't pick this up - I should figure that out. Commit: adbc66873a13dc3c6cbcbf86181f935d09fed490 https://github.com/galaxyproject/galaxy/commit/adbc66873a13dc3c6cbcbf86181f9... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py Log Message: ----------- Merge pull request #2203 from jmchilton/doctest_fix [16.04] Sync job_script module with Pulsar to fix doctest. Compare: https://github.com/galaxyproject/galaxy/compare/e5290e1964fc...adbc66873a13