Branch: refs/heads/release_16.10 Home: https://github.com/galaxyproject/galaxy Commit: 02c77929852d99ed837e0599140d2b3f40d89767 https://github.com/galaxyproject/galaxy/commit/02c77929852d99ed837e0599140d2... Author: John Chilton <jmchilton@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/2207e7f8aa20702fd3074fec63977... Author: Dannon Baker <dannon.baker@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/dad5563cac852971776d6670c8401... Author: Nicola Soranzo <nicola.soranzo@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/4345d8e7d7a3f27a46b6a06ce5463... Author: Nicola Soranzo <nicola.soranzo@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/140c570517df5c9c0728c6d5be442... Author: Nicola Soranzo <nicola.soranzo@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