Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: de2bde9f69bd225f94af97b45b5682235b2ba86b https://github.com/galaxyproject/galaxy/commit/de2bde9f69bd225f94af97b45b568... Author: Nate Coraor nate@bx.psu.edu Date: 2015-10-27 (Tue, 27 Oct 2015)

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

Log Message: ----------- Fix a regression introduced during egg smashing that broke the drmaa_library_path param to the drmaa runner (importing drmaa needs to be delayed until runner initialization so that the param to modify $DRMAA_LIBRARY_PATH can be evaluated).

Commit: 04f5b3087a3f1a5ba78e0a7c9313b3c2c82e8b87 https://github.com/galaxyproject/galaxy/commit/04f5b3087a3f1a5ba78e0a7c9313b... Author: Nate Coraor nate@bx.psu.edu Date: 2015-10-27 (Tue, 27 Oct 2015)

Changed paths: M client/galaxy/scripts/galaxy.library.js M lib/galaxy/managers/configuration.py M scripts/binary_compatibility.py M static/maps/galaxy.library.js.map M static/scripts/galaxy.library.js

Log Message: ----------- Merge branch 'dev' of https://github.com/galaxyproject/galaxy into smash-eggs-bugfix2

Commit: 04a32c7864bdeb078916b90a0b70cb059cc6ab1b https://github.com/galaxyproject/galaxy/commit/04a32c7864bdeb078916b90a0b70c... Author: Nate Coraor nate@bx.psu.edu Date: 2015-10-28 (Wed, 28 Oct 2015)

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

Log Message: ----------- Add a comment explaining the strange import behavior in drmaa to guard against future regression

Commit: f7d8bf7dbcf49c17273084c425e0a31e0ae3f7d8 https://github.com/galaxyproject/galaxy/commit/f7d8bf7dbcf49c17273084c425e0a... Author: Dannon Baker dannon.baker@gmail.com Date: 2015-10-28 (Wed, 28 Oct 2015)

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

Log Message: ----------- Merge pull request #996 from natefoo/smash-eggs-bugfix2

Fix a regression introduced during egg smashing that broke the drmaa_library_path param

Compare: https://github.com/galaxyproject/galaxy/compare/70bd41546151...f7d8bf7dbcf4