Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 7975798afb7975d13578ea791b3e7824641c9973 https://github.com/galaxyproject/galaxy/commit/7975798afb7975d13578ea791b3e7... Author: Nate Coraor nate@bx.psu.edu Date: 2015-10-26 (Mon, 26 Oct 2015)

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

Log Message: ----------- Do not attempt to read the `load` attribute of job runner plugins that do not have a `load` attribute.

`load` is an optional attrib on the <plugin> tag in job_conf.xml, used by the dynamic runner (which is always/automatically loaded) to pass plugin params. Galaxy servers using a `load`-less plugin will fail to start if using run.sh without this fix.

Commit: ef08ef4eadd6f0202b317c76e5766a2feb97f921 https://github.com/galaxyproject/galaxy/commit/ef08ef4eadd6f0202b317c76e5766... Author: Eric Rasche rasche.eric@gmail.com Date: 2015-10-26 (Mon, 26 Oct 2015)

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

Log Message: ----------- Merge pull request #986 from natefoo/smash_eggs

Do not attempt to read the `load` attribute of job runner plugins that do not have a `load` attribute.

Compare: https://github.com/galaxyproject/galaxy/compare/e423ab624608...ef08ef4eadd6