Branch: refs/heads/master Home: https://github.com/galaxyproject/galaxy Commit: e951455be37a787a26678e66e607004a9b8ce954 https://github.com/galaxyproject/galaxy/commit/e951455be37a787a26678e66e6070... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-09-08 (Tue, 08 Sep 2015) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/runners/pulsar.py M lib/pulsar/client/action_mapper.py M lib/pulsar/client/amqp_exchange.py M lib/pulsar/client/amqp_exchange_factory.py M lib/pulsar/client/client.py M lib/pulsar/client/config_util.py M lib/pulsar/client/decorators.py M lib/pulsar/client/interface.py M lib/pulsar/client/manager.py M lib/pulsar/client/staging/__init__.py M lib/pulsar/client/staging/down.py M lib/pulsar/client/staging/up.py M lib/pulsar/client/transport/curl.py M lib/pulsar/client/util.py Log Message: ----------- With Pulsar, ensure AMQP consumers receive published messages. Commit: 5bae90156fa7998b575981ac452db21f34683085 https://github.com/galaxyproject/galaxy/commit/5bae90156fa7998b575981ac452db... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-09-10 (Thu, 10 Sep 2015) Changed paths: M lib/pulsar/client/amqp_exchange.py M lib/pulsar/client/util.py Log Message: ----------- Fix a couple flake8 errors including a supposed PEP-8 violation that is actually a PEP-8-suggested acceptable option of how to handle the offending situation. =P Commit: 8778da43cb641a925c421b188aabe053be56e313 https://github.com/galaxyproject/galaxy/commit/8778da43cb641a925c421b188aabe... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-09-10 (Thu, 10 Sep 2015) Changed paths: M config/job_conf.xml.sample_advanced M lib/pulsar/client/amqp_exchange.py M lib/pulsar/client/amqp_exchange_factory.py M lib/pulsar/client/manager.py Log Message: ----------- Disable amqp_acknowledge by default, additional fixes from Pulsar's pickier flake8 checks. Commit: ff8e821013e59527bb2bdfacffef2a2db7e562d2 https://github.com/galaxyproject/galaxy/commit/ff8e821013e59527bb2bdfacffef2... Author: John Chilton <jmchilton@gmail.com> Date: 2015-09-10 (Thu, 10 Sep 2015) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/runners/pulsar.py M lib/pulsar/client/action_mapper.py M lib/pulsar/client/amqp_exchange.py M lib/pulsar/client/amqp_exchange_factory.py M lib/pulsar/client/client.py M lib/pulsar/client/config_util.py M lib/pulsar/client/decorators.py M lib/pulsar/client/interface.py M lib/pulsar/client/manager.py M lib/pulsar/client/staging/__init__.py M lib/pulsar/client/staging/down.py M lib/pulsar/client/staging/up.py M lib/pulsar/client/transport/curl.py M lib/pulsar/client/util.py Log Message: ----------- Merge pull request #704 from natefoo/amqp_ack [15.07] With Pulsar, ensure AMQP consumers receive published messages Commit: 448ff738f35ad3f8d627257f46c681a6a4907778 https://github.com/galaxyproject/galaxy/commit/448ff738f35ad3f8d627257f46c68... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-09-11 (Fri, 11 Sep 2015) Changed paths: M lib/galaxy/webapps/tool_shed/controllers/admin.py Log Message: ----------- fix incorrect indentation preventing changing of name/description of TS categories Commit: 16fb094f1a101064d6f2981166b060b1ba30aa0e https://github.com/galaxyproject/galaxy/commit/16fb094f1a101064d6f2981166b06... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-09-11 (Fri, 11 Sep 2015) Changed paths: M lib/galaxy/webapps/tool_shed/controllers/admin.py Log Message: ----------- Merge pull request #717 from martenson/fix-ts-edit-category [15.07] fix incorrect indentation preventing changing of name/description Commit: d41c137e2d6b4d9871bb25c5162745dda36e2f31 https://github.com/galaxyproject/galaxy/commit/d41c137e2d6b4d9871bb25c516274... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-09-11 (Fri, 11 Sep 2015) Changed paths: M templates/user/login.mako Log Message: ----------- Fix for logging in using OpenID when the OpenID isn't associated with a user yet. (cherry picked from commit 451196e4d39800995d7b1ea1f69b177294c3c632) Commit: 358dc4071462347dacecd1f6ec125d650b261db0 https://github.com/galaxyproject/galaxy/commit/358dc4071462347dacecd1f6ec125... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-09-11 (Fri, 11 Sep 2015) Changed paths: M templates/user/login.mako Log Message: ----------- Merge pull request #718 from blankenberg/openid_15.07 [15.07] Fix for logging in using OpenID when the OpenID isn't associated with a user yet. Commit: 819c7dce408f35f69457cd92803c63cf3efca0c4 https://github.com/galaxyproject/galaxy/commit/819c7dce408f35f69457cd92803c6... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-09-11 (Fri, 11 Sep 2015) Changed paths: M lib/pulsar/client/amqp_exchange.py Log Message: ----------- Pulsar client: Fix deepcopy() error with copying the errback method from PulsarExchange. Commit: 88abd3451d1b8cb7161fde7559684d5378dc76fc https://github.com/galaxyproject/galaxy/commit/88abd3451d1b8cb7161fde7559684... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-09-11 (Fri, 11 Sep 2015) Changed paths: M lib/pulsar/client/amqp_exchange.py Log Message: ----------- Merge pull request #719 from natefoo/amqp_ack [15.07] Pulsar client: Fix deepcopy() error with copying the errback method from PulsarExchange. Commit: d3bd0fa57765bd2d03f255099c2b4f0501ac6466 https://github.com/galaxyproject/galaxy/commit/d3bd0fa57765bd2d03f255099c2b4... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-09-16 (Wed, 16 Sep 2015) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/model/__init__.py Log Message: ----------- Do not change the state of jobs if a state update is received after they are set to a terminal state. Commit: 85552f73f712a9491af8d141a27369b21b615075 https://github.com/galaxyproject/galaxy/commit/85552f73f712a9491af8d141a2736... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-09-16 (Wed, 16 Sep 2015) Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/model/__init__.py Log Message: ----------- Merge pull request #737 from natefoo/job-terminal-update [15.07] Don't update the state of terminal jobs Commit: 81ad14a4e7c26dc5b3a5f9a026b72b2cbaad9266 https://github.com/galaxyproject/galaxy/commit/81ad14a4e7c26dc5b3a5f9a026b72... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M client/galaxy/scripts/mvc/upload/upload-row.js M static/maps/mvc/upload/upload-row.js.map M static/scripts/mvc/upload/upload-row.js Log Message: ----------- Backport keyup to change input Commit: 6044a5158c2ac86aab45613e6193a9d782899a9e https://github.com/galaxyproject/galaxy/commit/6044a5158c2ac86aab45613e6193a... Author: John Chilton <jmchilton@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M client/galaxy/scripts/mvc/upload/upload-row.js M static/maps/mvc/upload/upload-row.js.map M static/scripts/mvc/upload/upload-row.js Log Message: ----------- Merge pull request #780 from dannon/cherrypick_stuff_for_triple_approval [15.07] Backport keyup to change input Commit: a6715ebceccf036174ca5738e71a3e1052189411 https://github.com/galaxyproject/galaxy/commit/a6715ebceccf036174ca5738e71a3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M client/galaxy/scripts/mvc/upload/upload-row.js M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/model/__init__.py M lib/galaxy/webapps/tool_shed/controllers/admin.py M lib/pulsar/client/action_mapper.py M lib/pulsar/client/amqp_exchange.py M lib/pulsar/client/amqp_exchange_factory.py M lib/pulsar/client/client.py M lib/pulsar/client/config_util.py M lib/pulsar/client/decorators.py M lib/pulsar/client/interface.py M lib/pulsar/client/manager.py M lib/pulsar/client/staging/__init__.py M lib/pulsar/client/staging/down.py M lib/pulsar/client/staging/up.py M lib/pulsar/client/transport/curl.py M lib/pulsar/client/util.py M static/maps/mvc/upload/upload-row.js.map M static/scripts/mvc/upload/upload-row.js M templates/user/login.mako Log Message: ----------- Merge branch 'release_15.07' Compare: https://github.com/galaxyproject/galaxy/compare/2284b2242c72...a6715ebceccf