Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: f017de30bf7b0188f8872a9842c38750aab9a410 https://github.com/galaxyproject/galaxy/commit/f017de30bf7b0188f8872a9842c38... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-22 (Fri, 22 Dec 2017) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/error_level.py M lib/galaxy/jobs/output_checker.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/local.py M lib/galaxy/tools/parser/util.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/xsd/galaxy.xsd A test/functional/tools/exit_code_oom.xml M test/functional/tools/samples_tool_conf.xml A test/integration/resubmission_small_memory_job_conf.xml A test/integration/resubmission_small_memory_resubmission_to_large_job_conf.xml M test/integration/test_job_resubmission.py M test/unit/jobs/test_job_output_checker.py M test/unit/jobs/test_runner_local.py M test/unit/tools/test_parsing.py Log Message: ----------- Tool-centric annotation of out of memory errors. - Update explicit stdio definitions as well as detect_errors-based definitions to allow this. - Update runner code to allow resubmission in such cases. Commit: c78a23cb873cf5cbcf177cfa7052ae6dad506eea https://github.com/galaxyproject/galaxy/commit/c78a23cb873cf5cbcf177cfa7052a... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-12-27 (Wed, 27 Dec 2017) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/error_level.py M lib/galaxy/jobs/output_checker.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/local.py M lib/galaxy/tools/parser/util.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/xsd/galaxy.xsd A test/functional/tools/exit_code_oom.xml M test/functional/tools/samples_tool_conf.xml A test/integration/resubmission_small_memory_job_conf.xml A test/integration/resubmission_small_memory_resubmission_to_large_job_conf.xml M test/integration/test_job_resubmission.py M test/unit/jobs/test_job_output_checker.py M test/unit/jobs/test_runner_local.py M test/unit/tools/test_parsing.py Log Message: ----------- Merge pull request #5196 from jmchilton/oom_detect Tool-based annotation of out of memory errors. Compare: https://github.com/galaxyproject/galaxy/compare/7eea95c4917f...c78a23cb873c