Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e38e4449cddc0a6b31ca6f19d849cae1796e22df https://github.com/galaxyproject/galaxy/commit/e38e4449cddc0a6b31ca6f19d849c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-12-16 (Wed, 16 Dec 2015) Changed paths: M lib/galaxy/jobs/runners/local.py Log Message: ----------- If GALAXY_SLOTS is defined in the environment, use it for the local runner when job destinations haven't been configured. Commit: f51ee306b1e88001f76fd818e495cdbd9db2e10c https://github.com/galaxyproject/galaxy/commit/f51ee306b1e88001f76fd818e495c... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-16 (Wed, 16 Dec 2015) Changed paths: M lib/galaxy/jobs/runners/local.py Log Message: ----------- Merge pull request #1346 from dannon/local_slots If GALAXY_SLOTS is defined in the environment, use it for the local r… Compare: https://github.com/galaxyproject/galaxy/compare/191f75407ed9...f51ee306b1e8