Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: d41c137e2d6b4d9871bb25c5162745dda36e2f31
https://github.com/galaxyproject/galaxy/commit/d41c137e2d6b4d9871bb25c51627…
Author: Daniel Blankenberg <dan.blankenberg(a)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/358dc4071462347dacecd1f6ec12…
Author: Dannon Baker <dannon.baker(a)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: 88abd3451d1b8cb7161fde7559684d5378dc76fc
https://github.com/galaxyproject/galaxy/commit/88abd3451d1b8cb7161fde755968…
Author: Martin Cech <cech.marten(a)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/d3bd0fa57765bd2d03f255099c2b…
Author: Nate Coraor <nate(a)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/85552f73f712a9491af8d141a273…
Author: Martin Cech <cech.marten(a)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: 43c13ee1626779a4127f67b564ee88bb6b9af3ca
https://github.com/galaxyproject/galaxy/commit/43c13ee1626779a4127f67b564ee…
Author: Nate Coraor <nate(a)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:
-----------
Merge branch 'release_15.07' into dev
Conflicts:
lib/galaxy/model/__init__.py
Compare: https://github.com/galaxyproject/galaxy/compare/1e2adc6b5703...43c13ee16267