Branch: refs/heads/dev 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: 91799c3891fe60f94fc52501541326904cc96071 https://github.com/galaxyproject/galaxy/commit/91799c3891fe60f94fc5250154132... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-09-11 (Fri, 11 Sep 2015) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/runners/pulsar.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 Log Message: ----------- Merge branch 'release_15.07' into dev Compare: https://github.com/galaxyproject/galaxy/compare/c9ef883db64b...91799c3891fe