- galaxy-commits - lists.galaxyproject.org

[galaxyproject/usegalaxy-playbook] f3257f: Update Test and switch it to use UCSC builds and c...
by GitHub 07 Sep '17

07 Sep '17

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: f3257f3677ece1445559d1c517876c5455a6776d https://github.com/galaxyproject/usegalaxy-playbook/commit/f3257f3677ece144… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M CHANGELOG.md M env/test/files/galaxy/galaxy_version.yml M env/test/group_vars/galaxyservers/vars.yml M env/test/templates/galaxy/config/build_sites.yml.j2 Log Message: ----------- Update Test and switch it to use UCSC builds and chrom lengths in CVMFS.

1 0

[galaxyproject/galaxy] 13ab2f: join with header: add test-data output files
by GitHub 07 Sep '17

07 Sep '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 13ab2fd1a499d64f695e75ce4f6a96449fd8a75c https://github.com/galaxyproject/galaxy/commit/13ab2fd1a499d64f695e75ce4f6a… Author: lecorguille <lecorguille(a)users.noreply.github.com> Date: 2017-06-26 (Mon, 26 Jun 2017) Changed paths: A test-data/joiner_out1.bed A test-data/joiner_out2.bed A test-data/joiner_out3.bed A test-data/joiner_out4.bed Log Message: ----------- join with header: add test-data output files Commit: 5cf405902bd86fd3f57d8b8ed12a1e06f3c89662 https://github.com/galaxyproject/galaxy/commit/5cf405902bd86fd3f57d8b8ed12a… Author: lecorguille <lecorguille(a)users.noreply.github.com> Date: 2017-06-26 (Mon, 26 Jun 2017) Changed paths: A test-data/joiner_header_in1.tab A test-data/joiner_header_in2.tab A test-data/joiner_out5.tab M tools/filters/joiner.xml Log Message: ----------- join with header: add test Commit: 406c71acab0b0fea03dfa31712c06d066cb2a5c6 https://github.com/galaxyproject/galaxy/commit/406c71acab0b0fea03dfa31712c0… Author: lecorguille <lecorguille(a)users.noreply.github.com> Date: 2017-06-26 (Mon, 26 Jun 2017) Changed paths: M tools/filters/join.py M tools/filters/joiner.xml Log Message: ----------- join with header: test passed Commit: 712a7045e5a4b092d7ecb4de0e6f11544d10a956 https://github.com/galaxyproject/galaxy/commit/712a7045e5a4b092d7ecb4de0e6f… Author: lecorguille <lecorguille(a)users.noreply.github.com> Date: 2017-06-26 (Mon, 26 Jun 2017) Changed paths: A test-data/joiner_out7.tab M tools/filters/joiner.xml Log Message: ----------- join with header: add a regression test Commit: f8bc4076177d56c7b6beed9c975795b6c3a80dd0 https://github.com/galaxyproject/galaxy/commit/f8bc4076177d56c7b6beed9c9757… Author: lecorguille <lecorguille(a)users.noreply.github.com> Date: 2017-06-26 (Mon, 26 Jun 2017) Changed paths: A test-data/joiner_out6.tab M tools/filters/joiner.xml Log Message: ----------- join with header: add a use case with a fill value Commit: 222a7502e7672be3d433611269735e449daa0101 https://github.com/galaxyproject/galaxy/commit/222a7502e7672be3d43361126973… Author: lecorguille <lecorguille(a)users.noreply.github.com> Date: 2017-06-26 (Mon, 26 Jun 2017) Changed paths: M tools/filters/joiner.xml Log Message: ----------- join header: fix tool syntax Commit: 530827f6548e5b4360ac7d6a2e1569395ec8ec68 https://github.com/galaxyproject/galaxy/commit/530827f6548e5b4360ac7d6a2e15… Author: lecorguille <lecorguille(a)users.noreply.github.com> Date: 2017-06-26 (Mon, 26 Jun 2017) Changed paths: M tools/filters/join.py Log Message: ----------- join with header: flake import order fix Commit: d887cb17f0e330bed43d80073801568165746454 https://github.com/galaxyproject/galaxy/commit/d887cb17f0e330bed43d80073801… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: A test-data/joiner_header_in1.tab A test-data/joiner_header_in2.tab A test-data/joiner_out1.bed A test-data/joiner_out2.bed A test-data/joiner_out3.bed A test-data/joiner_out4.bed A test-data/joiner_out5.tab A test-data/joiner_out6.tab A test-data/joiner_out7.tab M tools/filters/join.py M tools/filters/joiner.xml Log Message: ----------- Merge join_header into dev. Commit: 696a1eda3ca5695f9c0631c3f2f357c83b4a8995 https://github.com/galaxyproject/galaxy/commit/696a1eda3ca5695f9c0631c3f2f3… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: A test-data/joiner_header_in1.tab A test-data/joiner_header_in2.tab A test-data/joiner_out1.bed A test-data/joiner_out2.bed A test-data/joiner_out3.bed A test-data/joiner_out4.bed A test-data/joiner_out5.tab A test-data/joiner_out6.tab A test-data/joiner_out7.tab M tools/filters/join.py M tools/filters/joiner.xml Log Message: ----------- Merge integration branch of 'header_join' into dev Compare: https://github.com/galaxyproject/galaxy/compare/20b935639670...696a1eda3ca5

1 0

[galaxyproject/galaxy] 30b97f: refactor callback hell to use promises
by GitHub 06 Sep '17

06 Sep '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 30b97f1f1ea9987f967e9774f65ed2e3d8450a3b https://github.com/galaxyproject/galaxy/commit/30b97f1f1ea9987f967e9774f65e… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- refactor callback hell to use promises Commit: cf09a25fdc742998d5bd71deca32527a947c6812 https://github.com/galaxyproject/galaxy/commit/cf09a25fdc742998d5bd71deca32… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- fix import of collections to datalibs I swear I fixed this before Commit: 20b935639670d171eadb96b3406d00174d978ae6 https://github.com/galaxyproject/galaxy/commit/20b935639670d171eadb96b3406d… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Merge pull request #4568 from martenson/fix-collection-import Fix datalib collection import Compare: https://github.com/galaxyproject/galaxy/compare/8f7d2374cac0...20b935639670

1 0

[galaxyproject/galaxy] 49eadb: Increase the robustness of Selenium workflow manag...
by GitHub 06 Sep '17

06 Sep '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 49eadb682ac5b2662dbe603cea4f0ba68cf59eec https://github.com/galaxyproject/galaxy/commit/49eadb682ac5b2662dbe603cea4f… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-09-05 (Tue, 05 Sep 2017) Changed paths: M test/galaxy_selenium/navigates_galaxy.py M test/selenium_tests/test_workflow_management.py Log Message: ----------- Increase the robustness of Selenium workflow management tests. Next Selenium build encountered a few different problems with importing workflows from URL: - https://jenkins.galaxyproject.org/job/selenium/213/artifact/213-test-errors… - https://jenkins.galaxyproject.org/job/selenium/213/artifact/213-test-errors… - https://jenkins.galaxyproject.org/job/selenium/213/artifact/213-test-errors… On full test retry, only one of these actually caused a test error but we shouldn't have to depend on the test re-running stuff. Commit: 8f7d2374cac0fcf44b2f878490d912e9bb98a8ec https://github.com/galaxyproject/galaxy/commit/8f7d2374cac0fcf44b2f878490d9… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M test/galaxy_selenium/navigates_galaxy.py M test/selenium_tests/test_workflow_management.py Log Message: ----------- Merge pull request #4564 from jmchilton/selenium_fixes_20 Increase the robustness of Selenium workflow management tests. Compare: https://github.com/galaxyproject/galaxy/compare/e8ee2741f909...8f7d2374cac0

1 0

[galaxyproject/galaxy] 095c10: add logging to ts index building
by GitHub 06 Sep '17

06 Sep '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 095c1045b6605756934ef9524907d6cb73c4baf9 https://github.com/galaxyproject/galaxy/commit/095c1045b6605756934ef9524907… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M scripts/tool_shed/build_ts_whoosh_index.py Log Message: ----------- add logging to ts index building Commit: e8ee2741f9093496aa68c2afe435aa9fc7dd8fcc https://github.com/galaxyproject/galaxy/commit/e8ee2741f9093496aa68c2afe435… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M scripts/tool_shed/build_ts_whoosh_index.py Log Message: ----------- Merge pull request #4567 from martenson/index-refresh-logging add logging to ts index building Compare: https://github.com/galaxyproject/galaxy/compare/eb799267ee35...e8ee2741f909

1 0

[galaxyproject/galaxy] 47ba64: 2017-08 Security Patch
by GitHub 06 Sep '17

06 Sep '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 47ba644de78dd82cfaed205128bd34056aa99078 https://github.com/galaxyproject/galaxy/commit/47ba644de78dd82cfaed205128bd… Author: E Rasche <hxr(a)hx42.org> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M lib/galaxy/datatypes/data.py M lib/galaxy/web/framework/base.py Log Message: ----------- 2017-08 Security Patch Commit: 5a18464d547d7497285ee25067050ee4cd665eda https://github.com/galaxyproject/galaxy/commit/5a18464d547d7497285ee2506705… Author: E Rasche <hxr(a)hx42.org> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M lib/galaxy/datatypes/data.py M lib/galaxy/web/framework/base.py Log Message: ----------- 2017-08 Security Patch Commit: 02c77929852d99ed837e0599140d2b3f40d89767 https://github.com/galaxyproject/galaxy/commit/02c77929852d99ed837e0599140d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- [16.01] Backport uwsgi fix from #2836. Now that newer releases require a library that the mere presence of breaks an older version of Galaxy, I think this will be encountered more during development. It is breaking Planemo's ability to switch between different versions of Galaxy. https://github.com/galaxyproject/galaxy/pull/2836 Commit: 2207e7f8aa20702fd3074fec63977520d3213299 https://github.com/galaxyproject/galaxy/commit/2207e7f8aa20702fd3074fec6397… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge pull request #4565 from jmchilton/backport_uwsgi_fix [16.01] Backport uwsgi fix from #2836. Commit: dad5563cac852971776d6670c8401b0cb6a2ce6a https://github.com/galaxyproject/galaxy/commit/dad5563cac852971776d6670c840… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Commit: 4345d8e7d7a3f27a46b6a06ce54637b74951915a https://github.com/galaxyproject/galaxy/commit/4345d8e7d7a3f27a46b6a06ce546… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/util/postfork.py Log Message: ----------- Merge branch 'release_16.04' into release_16.07 Conflicts: lib/galaxy/config.py Commit: 140c570517df5c9c0728c6d5be442d82b2f78ae9 https://github.com/galaxyproject/galaxy/commit/140c570517df5c9c0728c6d5be44… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Log Message: ----------- Merge branch 'release_16.07' into release_16.10 Commit: 759780b72c03efd6563c0c53efc9edff9505979c https://github.com/galaxyproject/galaxy/commit/759780b72c03efd6563c0c53efc9… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Log Message: ----------- Merge branch 'release_16.10' into release_17.01 Commit: 41fe55129a3af95d7ef84ecb387b954b14509843 https://github.com/galaxyproject/galaxy/commit/41fe55129a3af95d7ef84ecb387b… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Log Message: ----------- Merge branch 'release_17.01' into release_17.05 Conflicts: lib/galaxy/datatypes/data.py Commit: eb799267ee35da3b5b9dbef8a58ed8107aeb16ae https://github.com/galaxyproject/galaxy/commit/eb799267ee35da3b5b9dbef8a58e… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Log Message: ----------- Merge branch 'release_17.05' into dev Compare: https://github.com/galaxyproject/galaxy/compare/a95566b36c18...eb799267ee35

1 0

[galaxyproject/galaxy] 47ba64: 2017-08 Security Patch
by GitHub 06 Sep '17

06 Sep '17

Branch: refs/heads/release_17.05 Home: https://github.com/galaxyproject/galaxy Commit: 47ba644de78dd82cfaed205128bd34056aa99078 https://github.com/galaxyproject/galaxy/commit/47ba644de78dd82cfaed205128bd… Author: E Rasche <hxr(a)hx42.org> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M lib/galaxy/datatypes/data.py M lib/galaxy/web/framework/base.py Log Message: ----------- 2017-08 Security Patch Commit: 5a18464d547d7497285ee25067050ee4cd665eda https://github.com/galaxyproject/galaxy/commit/5a18464d547d7497285ee2506705… Author: E Rasche <hxr(a)hx42.org> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M lib/galaxy/datatypes/data.py M lib/galaxy/web/framework/base.py Log Message: ----------- 2017-08 Security Patch Commit: 02c77929852d99ed837e0599140d2b3f40d89767 https://github.com/galaxyproject/galaxy/commit/02c77929852d99ed837e0599140d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- [16.01] Backport uwsgi fix from #2836. Now that newer releases require a library that the mere presence of breaks an older version of Galaxy, I think this will be encountered more during development. It is breaking Planemo's ability to switch between different versions of Galaxy. https://github.com/galaxyproject/galaxy/pull/2836 Commit: 2207e7f8aa20702fd3074fec63977520d3213299 https://github.com/galaxyproject/galaxy/commit/2207e7f8aa20702fd3074fec6397… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge pull request #4565 from jmchilton/backport_uwsgi_fix [16.01] Backport uwsgi fix from #2836. Commit: dad5563cac852971776d6670c8401b0cb6a2ce6a https://github.com/galaxyproject/galaxy/commit/dad5563cac852971776d6670c840… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Commit: 4345d8e7d7a3f27a46b6a06ce54637b74951915a https://github.com/galaxyproject/galaxy/commit/4345d8e7d7a3f27a46b6a06ce546… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/util/postfork.py Log Message: ----------- Merge branch 'release_16.04' into release_16.07 Conflicts: lib/galaxy/config.py Commit: 140c570517df5c9c0728c6d5be442d82b2f78ae9 https://github.com/galaxyproject/galaxy/commit/140c570517df5c9c0728c6d5be44… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Log Message: ----------- Merge branch 'release_16.07' into release_16.10 Commit: 759780b72c03efd6563c0c53efc9edff9505979c https://github.com/galaxyproject/galaxy/commit/759780b72c03efd6563c0c53efc9… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Log Message: ----------- Merge branch 'release_16.10' into release_17.01 Commit: 41fe55129a3af95d7ef84ecb387b954b14509843 https://github.com/galaxyproject/galaxy/commit/41fe55129a3af95d7ef84ecb387b… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Log Message: ----------- Merge branch 'release_17.01' into release_17.05 Conflicts: lib/galaxy/datatypes/data.py Compare: https://github.com/galaxyproject/galaxy/compare/1d485390b0af...41fe55129a3a

1 0

[galaxyproject/galaxy] 580811: Potential fix for transiently failing Selenium pub...
by GitHub 06 Sep '17

06 Sep '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 580811d7405f4566bfb8cb62e3bff5c7cc0e80a7 https://github.com/galaxyproject/galaxy/commit/580811d7405f4566bfb8cb62e3bf… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-09-05 (Tue, 05 Sep 2017) Changed paths: M test/selenium_tests/test_published_histories_grid.py Log Message: ----------- Potential fix for transiently failing Selenium published histories test. The the [latest Selenium test execution](https://jenkins.galaxyproject.org/job/selenium/212/testReport/) most of the published histories tests failed. It looks like this is because of the three histories that were supposed to be published, only 2 were actually published. My best guess for what happeend was that the click of the button to publish the history occurred but the next Selenium command happened so quickly that the page had not gotten a chance to respond to the click. This tweaked approach to publishing histories ensures we stay on the page until the "unpublish" link appears - this will either fix the problem or rule this theory out as the explanation. Commit: a95566b36c18667cca73286f463b89fabeb8fbf8 https://github.com/galaxyproject/galaxy/commit/a95566b36c18667cca73286f463b… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M test/selenium_tests/test_published_histories_grid.py Log Message: ----------- Merge pull request #4562 from jmchilton/selenium_fixes_19 Potential fix for transiently failing Selenium published histories test. Compare: https://github.com/galaxyproject/galaxy/compare/37802abee2b5...a95566b36c18

1 0

[galaxyproject/galaxy] 47ba64: 2017-08 Security Patch
by GitHub 06 Sep '17

06 Sep '17

Branch: refs/heads/release_17.01 Home: https://github.com/galaxyproject/galaxy Commit: 47ba644de78dd82cfaed205128bd34056aa99078 https://github.com/galaxyproject/galaxy/commit/47ba644de78dd82cfaed205128bd… Author: E Rasche <hxr(a)hx42.org> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M lib/galaxy/datatypes/data.py M lib/galaxy/web/framework/base.py Log Message: ----------- 2017-08 Security Patch Commit: 02c77929852d99ed837e0599140d2b3f40d89767 https://github.com/galaxyproject/galaxy/commit/02c77929852d99ed837e0599140d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- [16.01] Backport uwsgi fix from #2836. Now that newer releases require a library that the mere presence of breaks an older version of Galaxy, I think this will be encountered more during development. It is breaking Planemo's ability to switch between different versions of Galaxy. https://github.com/galaxyproject/galaxy/pull/2836 Commit: 2207e7f8aa20702fd3074fec63977520d3213299 https://github.com/galaxyproject/galaxy/commit/2207e7f8aa20702fd3074fec6397… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge pull request #4565 from jmchilton/backport_uwsgi_fix [16.01] Backport uwsgi fix from #2836. Commit: dad5563cac852971776d6670c8401b0cb6a2ce6a https://github.com/galaxyproject/galaxy/commit/dad5563cac852971776d6670c840… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Commit: 4345d8e7d7a3f27a46b6a06ce54637b74951915a https://github.com/galaxyproject/galaxy/commit/4345d8e7d7a3f27a46b6a06ce546… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/util/postfork.py Log Message: ----------- Merge branch 'release_16.04' into release_16.07 Conflicts: lib/galaxy/config.py Commit: 140c570517df5c9c0728c6d5be442d82b2f78ae9 https://github.com/galaxyproject/galaxy/commit/140c570517df5c9c0728c6d5be44… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Log Message: ----------- Merge branch 'release_16.07' into release_16.10 Commit: 759780b72c03efd6563c0c53efc9edff9505979c https://github.com/galaxyproject/galaxy/commit/759780b72c03efd6563c0c53efc9… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Log Message: ----------- Merge branch 'release_16.10' into release_17.01 Compare: https://github.com/galaxyproject/galaxy/compare/5a18464d547d...759780b72c03

1 0

[galaxyproject/galaxy] 02c779: [16.01] Backport uwsgi fix from #2836.
by GitHub 06 Sep '17

06 Sep '17

Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: 02c77929852d99ed837e0599140d2b3f40d89767 https://github.com/galaxyproject/galaxy/commit/02c77929852d99ed837e0599140d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- [16.01] Backport uwsgi fix from #2836. Now that newer releases require a library that the mere presence of breaks an older version of Galaxy, I think this will be encountered more during development. It is breaking Planemo's ability to switch between different versions of Galaxy. https://github.com/galaxyproject/galaxy/pull/2836 Commit: 2207e7f8aa20702fd3074fec63977520d3213299 https://github.com/galaxyproject/galaxy/commit/2207e7f8aa20702fd3074fec6397… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge pull request #4565 from jmchilton/backport_uwsgi_fix [16.01] Backport uwsgi fix from #2836. Commit: dad5563cac852971776d6670c8401b0cb6a2ce6a https://github.com/galaxyproject/galaxy/commit/dad5563cac852971776d6670c840… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Commit: 4345d8e7d7a3f27a46b6a06ce54637b74951915a https://github.com/galaxyproject/galaxy/commit/4345d8e7d7a3f27a46b6a06ce546… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M lib/galaxy/util/postfork.py Log Message: ----------- Merge branch 'release_16.04' into release_16.07 Conflicts: lib/galaxy/config.py Commit: 140c570517df5c9c0728c6d5be442d82b2f78ae9 https://github.com/galaxyproject/galaxy/commit/140c570517df5c9c0728c6d5be44… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-09-06 (Wed, 06 Sep 2017) Log Message: ----------- Merge branch 'release_16.07' into release_16.10 Compare: https://github.com/galaxyproject/galaxy/compare/47ba644de78d...140c570517df

1 0