Branch: refs/heads/release_16.04
Home: https://github.com/galaxyproject/galaxy
Commit: 4cf8d691e525142125af56b0627f804eb1bddd7c
https://github.com/galaxyproject/galaxy/commit/4cf8d691e525142125af56b0627f…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-06-10 (Fri, 10 Jun 2016)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/workflow.py
Log Message:
-----------
fix image generation for workflows with missing tools
currently this ends up with a server error
Commit: fdf9520783ae55795a01e4092b1d6718c5fca5b4
https://github.com/galaxyproject/galaxy/commit/fdf9520783ae55795a01e4092b1d…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-06-10 (Fri, 10 Jun 2016)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/workflow.py
Log Message:
-----------
drop unnecessary raise and fix capitalization
incorporate comments of Bjoern and Nicola
Commit: 5245e8a693fc3633762f29a468b84e3487083133
https://github.com/galaxyproject/galaxy/commit/5245e8a693fc3633762f29a468b8…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2016-06-11 (Sat, 11 Jun 2016)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/workflow.py
Log Message:
-----------
Merge pull request #2488 from martenson/wrap-svg-for-missing-tools
[16.04] fix image generation for workflows with missing tools
Compare: https://github.com/galaxyproject/galaxy/compare/43694be8647e...5245e8a693fc
Branch: refs/heads/release_16.04
Home: https://github.com/galaxyproject/galaxy
Commit: 7c40c85034d918c50e8b22c1a3eb39746a6e043d
https://github.com/galaxyproject/galaxy/commit/7c40c85034d918c50e8b22c1a3eb…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2016-06-10 (Fri, 10 Jun 2016)
Changed paths:
M lib/galaxy/jobs/runners/drmaa.py
Log Message:
-----------
Fix for job handlers losing track of jobs when using DRMAA with internalexception_retries or invalidjobexception_retries
Commit: 933f42619e2fb2fb518702397aa2f11ea2cfb8e0
https://github.com/galaxyproject/galaxy/commit/933f42619e2fb2fb518702397aa2…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2016-06-10 (Fri, 10 Jun 2016)
Changed paths:
M lib/galaxy/jobs/runners/drmaa.py
Log Message:
-----------
Log all failed job status checks
Commit: dbbf1edef3d943e13db4e926840061a65742eaab
https://github.com/galaxyproject/galaxy/commit/dbbf1edef3d943e13db4e9268400…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-06-10 (Fri, 10 Jun 2016)
Changed paths:
M lib/galaxy/jobs/runners/drmaa.py
Log Message:
-----------
Merge pull request #2484 from nsoranzo/release_16.01_fix_for_4a024b882f504aded1db32f1ed056f7c9109d218
[16.01] Fix for job handlers losing track of jobs when using DRMAA with internalexception_retries or invalidjobexception_retries
Commit: 14844e48eb3869dbb2ecdca29e6069904bac4f28
https://github.com/galaxyproject/galaxy/commit/14844e48eb3869dbb2ecdca29e60…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2016-06-10 (Fri, 10 Jun 2016)
Changed paths:
M lib/galaxy/jobs/runners/drmaa.py
Log Message:
-----------
Merge branch 'release_16.01' into release_16.04
Conflicts:
lib/galaxy/jobs/runners/drmaa.py
Compare: https://github.com/galaxyproject/galaxy/compare/04863c833bb1...14844e48eb38
Branch: refs/heads/release_16.01
Home: https://github.com/galaxyproject/galaxy
Commit: 7c40c85034d918c50e8b22c1a3eb39746a6e043d
https://github.com/galaxyproject/galaxy/commit/7c40c85034d918c50e8b22c1a3eb…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2016-06-10 (Fri, 10 Jun 2016)
Changed paths:
M lib/galaxy/jobs/runners/drmaa.py
Log Message:
-----------
Fix for job handlers losing track of jobs when using DRMAA with internalexception_retries or invalidjobexception_retries
Commit: 933f42619e2fb2fb518702397aa2f11ea2cfb8e0
https://github.com/galaxyproject/galaxy/commit/933f42619e2fb2fb518702397aa2…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2016-06-10 (Fri, 10 Jun 2016)
Changed paths:
M lib/galaxy/jobs/runners/drmaa.py
Log Message:
-----------
Log all failed job status checks
Commit: dbbf1edef3d943e13db4e926840061a65742eaab
https://github.com/galaxyproject/galaxy/commit/dbbf1edef3d943e13db4e9268400…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-06-10 (Fri, 10 Jun 2016)
Changed paths:
M lib/galaxy/jobs/runners/drmaa.py
Log Message:
-----------
Merge pull request #2484 from nsoranzo/release_16.01_fix_for_4a024b882f504aded1db32f1ed056f7c9109d218
[16.01] Fix for job handlers losing track of jobs when using DRMAA with internalexception_retries or invalidjobexception_retries
Compare: https://github.com/galaxyproject/galaxy/compare/47a651609600...dbbf1edef3d9
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: b3edbcaec785c93171ac5b08805dec3ade92e4b7
https://github.com/galaxyproject/galaxy/commit/b3edbcaec785c93171ac5b08805d…
Author: Dave Bouvier <dave(a)bx.psu.edu>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M lib/tool_shed/util/repository_util.py
Log Message:
-----------
Workaround for circular import situation.
Commit: 4c6389fb05a50b8b2d8f5f3fb2c9ea635a2bb6a6
https://github.com/galaxyproject/galaxy/commit/4c6389fb05a50b8b2d8f5f3fb2c9…
Author: Dave Bouvier <dave(a)bx.psu.edu>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M lib/galaxy/jobs/metrics/instrumenters/collectl.py
M lib/galaxy/model/__init__.py
M lib/galaxy/objectstore/__init__.py
M lib/galaxy/objectstore/s3.py
M lib/galaxy/util/__init__.py
R lib/galaxy/util/directory_hash.py
M lib/galaxy/webapps/tool_shed/model/__init__.py
M lib/tool_shed/util/repository_util.py
Log Message:
-----------
Move directory_hash_id into galaxy/util.py. Use util.directory_hash_id throughout.
Commit: 89ba1ddef4706436aa5b2f30a37a8247755ea1a8
https://github.com/galaxyproject/galaxy/commit/89ba1ddef4706436aa5b2f30a37a…
Author: Dave Bouvier <dave(a)bx.psu.edu>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M lib/tool_shed/util/repository_util.py
Log Message:
-----------
Remove now-unused import.
Commit: 4da1f6a5eaf1228aa42b0ee7e8d1327a58706602
https://github.com/galaxyproject/galaxy/commit/4da1f6a5eaf1228aa42b0ee7e8d1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M lib/galaxy/jobs/metrics/instrumenters/collectl.py
M lib/galaxy/model/__init__.py
M lib/galaxy/objectstore/__init__.py
M lib/galaxy/objectstore/s3.py
M lib/galaxy/util/__init__.py
R lib/galaxy/util/directory_hash.py
M lib/galaxy/webapps/tool_shed/model/__init__.py
M lib/tool_shed/util/repository_util.py
Log Message:
-----------
Merge pull request #2477 from davebx/circular_workaround
Workaround for circular import. Refactor.
Compare: https://github.com/galaxyproject/galaxy/compare/b7108cfb8b62...4da1f6a5eaf1