Branch: refs/heads/usegalaxy Home: https://github.com/galaxyproject/galaxy Commit: 15aa0bd615726ed46fa7beec9a364bb3c11df9f2 https://github.com/galaxyproject/galaxy/commit/15aa0bd615726ed46fa7beec9a364... Author: John Chilton jmchilton@gmail.com Date: 2017-03-22 (Wed, 22 Mar 2017)

Changed paths: M lib/galaxy/jobs/runners/__init__.py

Log Message: ----------- Fix problem with cleaning up jobs in local runner.

Fixes #3801 (broken in b78287f as part of #3291).

Commit: 65cbddee7c3bc2d772686b261aaf853f84f76235 https://github.com/galaxyproject/galaxy/commit/65cbddee7c3bc2d772686b261aaf8... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2017-03-22 (Wed, 22 Mar 2017)

Changed paths: M lib/galaxy/jobs/runners/__init__.py

Log Message: ----------- Merge pull request #3803 from jmchilton/1701_fixes_0

[17.01] Fix problem with cleaning up jobs in local runner.

Commit: d8af125af4d3798c32b31793c10f9b9426d7dfe2 https://github.com/galaxyproject/galaxy/commit/d8af125af4d3798c32b31793c10f9... Author: Hans-Rudolf Hotz hrhotz@users.noreply.github.com Date: 2017-03-27 (Mon, 27 Mar 2017)

Changed paths: M lib/galaxy/tools/__init__.py

Log Message: ----------- Update __init__.py

Commit: 3068c9f053554c448a30388d46b91a6979e39cb7 https://github.com/galaxyproject/galaxy/commit/3068c9f053554c448a30388d46b91... Author: John Chilton jmchilton@gmail.com Date: 2017-03-27 (Mon, 27 Mar 2017)

Changed paths: M lib/galaxy/tools/__init__.py

Log Message: ----------- Fix CONVERTER_gff_to_fli_0 for striping Galaxy from Python environment.

Taking another stab at fixing #3499 which was broken with #3364. Last attempt at fixing converters didn't cover this (#3690) but I missed this tool and bed to fli fixed in #3822.

Commit: 70b22dffc28830b4f9fc3c9a89845d6ccf32e559 https://github.com/galaxyproject/galaxy/commit/70b22dffc28830b4f9fc3c9a89845... Author: Martin Cech marten@bx.psu.edu Date: 2017-03-27 (Mon, 27 Mar 2017)

Changed paths: M lib/galaxy/tools/__init__.py

Log Message: ----------- Merge pull request #3824 from jmchilton/more_tool_env_fixes

[17.01] More CONVERTER fixes for restricting tools' Python environment.

Commit: 812b04bb3abec97f1f465e9e9136904bd7e4164c https://github.com/galaxyproject/galaxy/commit/812b04bb3abec97f1f465e9e91369... Author: Martin Cech marten@bx.psu.edu Date: 2017-03-27 (Mon, 27 Mar 2017)

Changed paths: M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/tools/__init__.py

Log Message: ----------- Merge pull request #3826 from galaxyproject/release_17.01

[usegalaxy] Merge 17.01

Compare: https://github.com/galaxyproject/galaxy/compare/f9b8e6a51a17...812b04bb3abe