Branch: refs/heads/master Home: https://github.com/galaxyproject/galaxy Commit: 3680a016fdc779b417bf9820d63c4adf164479fc https://github.com/galaxyproject/galaxy/commit/3680a016fdc779b417bf9820d63c4... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-06-15 (Wed, 15 Jun 2016) Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/runners/pulsar.py Log Message: ----------- Bump Pulsar client lib version number and add timeout options to Pulsar runner to fix a timeout bug that kills the handlers on usegalaxy.org Commit: f3f0c30106a8adcdb993ec260aff408ca6667407 https://github.com/galaxyproject/galaxy/commit/f3f0c30106a8adcdb993ec260aff4... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-06-15 (Wed, 15 Jun 2016) Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/runners/pulsar.py Log Message: ----------- Merge pull request #2504 from natefoo/pulsar-client-timeout [16.04] Bump Pulsar client lib version number and add timeout options to Pulsar runner Commit: c8af30009b3201037e55ff26a7d26f1734ae1dc3 https://github.com/galaxyproject/galaxy/commit/c8af30009b3201037e55ff26a7d26... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-06-16 (Thu, 16 Jun 2016) Changed paths: M client/galaxy/scripts/mvc/history/history-model.js M static/maps/mvc/history/history-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/history-model.js Log Message: ----------- UI, history: backport of 3672eda (update using xhr date header) Commit: 70b40979968f1ec3c36f025e5639b879ad017ca1 https://github.com/galaxyproject/galaxy/commit/70b40979968f1ec3c36f025e5639b... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-06-16 (Thu, 16 Jun 2016) Changed paths: M client/galaxy/scripts/mvc/history/history-model.js M static/maps/mvc/history/history-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/history-model.js Log Message: ----------- Merge pull request #2506 from carlfeberhard/twice-a-day [16.04] UI, history: backport of 3672eda Commit: 8b2ae464678e96c917ed06a82f158f7c3b97b34a https://github.com/galaxyproject/galaxy/commit/8b2ae464678e96c917ed06a82f158... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Copy PJAs when importing a workflow. Commit: 5aaa1ecdf0cb9a015bbfaf68d02cdab30bf02335 https://github.com/galaxyproject/galaxy/commit/5aaa1ecdf0cb9a015bbfaf68d02cd... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Merge pull request #2518 from dannon/backport_to_1601_pjafix [16.01] Copy PJAs when importing a workflow. Commit: 67eca6d4901615b57c2690e719a220afe6d42b28 https://github.com/galaxyproject/galaxy/commit/67eca6d4901615b57c2690e719a22... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Commit: 9226e60fcc3c45434cdfdee80ff518c7ba94c20b https://github.com/galaxyproject/galaxy/commit/9226e60fcc3c45434cdfdee80ff51... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M client/galaxy/scripts/mvc/history/history-model.js M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/model/__init__.py M static/maps/mvc/history/history-model.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/history-model.js Log Message: ----------- Merge branch 'release_16.04' Compare: https://github.com/galaxyproject/galaxy/compare/06eeb8bafec6...9226e60fcc3c