Branch: refs/heads/release_18.05 Home: https://github.com/galaxyproject/galaxy Commit: a00bd8bf8eb22bfb38be9146c244fd22f60d3a8f https://github.com/galaxyproject/galaxy/commit/a00bd8bf8eb22bfb38be9146c244f... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-05-21 (Mon, 21 May 2018) Changed paths: M doc/parse_gx_xsd.py Log Message: ----------- escape pipe in details so we can have pipes inside markdown tables Commit: 01d2a5c2ae7e5a1f3b5fcfdd2b1eca766a69d5ec https://github.com/galaxyproject/galaxy/commit/01d2a5c2ae7e5a1f3b5fcfdd2b1ec... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-05-22 (Tue, 22 May 2018) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Fix parsing of `scontrol show job` Fix the following traceback: ``` galaxy.jobs.runners.slurm ERROR 2018-05-22 13:01:07,050 (1024816/14094939) Failure in SLURM _complete_terminal_job(), job final state will be: failed Traceback (most recent call last): File "/tgac/services/galaxy/prod/galaxy/lib/galaxy/jobs/runners/slurm.py", line 86, in _complete_terminal_job slurm_state = _get_slurm_state() File "/tgac/services/galaxy/prod/galaxy/lib/galaxy/jobs/runners/slurm.py", line 81, in _get_slurm_state job_info_dict = dict([out_param.split('=', 1) for out_param in stdout.split()]) ValueError: dictionary update sequence element #52 has length 1; 2 is required ``` Commit: 939c3be132b9cd606cd5f1189293f15000a486d8 https://github.com/galaxyproject/galaxy/commit/939c3be132b9cd606cd5f1189293f... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-05-22 (Tue, 22 May 2018) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Merge pull request #6194 from nsoranzo/fix__get_slurm_state [18.01] Fix parsing of `scontrol show job` Commit: 9a840537cb5037e280a8db14125a46fbb422d305 https://github.com/galaxyproject/galaxy/commit/9a840537cb5037e280a8db14125a4... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-05-22 (Tue, 22 May 2018) Changed paths: M doc/parse_gx_xsd.py Log Message: ----------- pass the check for pipe presence in details the docs build fine and the table renders fine too Commit: 6f79f28f1793c135b1e0f332987fd62e9dea93b6 https://github.com/galaxyproject/galaxy/commit/6f79f28f1793c135b1e0f332987fd... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-05-22 (Tue, 22 May 2018) Changed paths: M doc/parse_gx_xsd.py Log Message: ----------- Merge pull request #6187 from martenson/fix-doc-markdown-table [18.01] escape pipe while parsing xsd details Commit: a5297af19017a009fe887a5c04dae281ab234cae https://github.com/galaxyproject/galaxy/commit/a5297af19017a009fe887a5c04dae... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-05-22 (Tue, 22 May 2018) Changed paths: M doc/parse_gx_xsd.py M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Merge branch 'release_18.01' into release_18.05 Compare: https://github.com/galaxyproject/galaxy/compare/440f17875f6b...a5297af19017 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.