Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 7d1b525682c9dd0786b7ccca23c3b0695b3c0751 https://github.com/galaxyproject/galaxy/commit/7d1b525682c9dd0786b7ccca23c3b... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-25 (Fri, 25 Mar 2016)

Changed paths: M client/galaxy/scripts/viz/trackster/tracks.js M lib/galaxy/webapps/galaxy/api/datasets.py M static/maps/viz/trackster/tracks.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/viz/trackster/tracks.js

Log Message: ----------- The response from dataproviders here can return data===null in addition to being simply undefined. This corrects the logic shortcutting and prevents errors like 'Cannot read property 'min' of null'

Commit: 425f0daa2d9030a36c2af5b144a4d563542153a2 https://github.com/galaxyproject/galaxy/commit/425f0daa2d9030a36c2af5b144a4d... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2016-03-25 (Fri, 25 Mar 2016)

Changed paths: M client/galaxy/scripts/viz/trackster/tracks.js M lib/galaxy/webapps/galaxy/api/datasets.py M static/maps/viz/trackster/tracks.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/viz/trackster/tracks.js

Log Message: ----------- Merge pull request #2014 from dannon/trackster_dataprovider_fix

[16.01] Fix trackster erroring when fetching data from regions or datasets with no content.

Commit: 4f2661a1e9b3179b8df7ff773b71d15aa756dd8d https://github.com/galaxyproject/galaxy/commit/4f2661a1e9b3179b8df7ff773b71d... Author: John Chilton jmchilton@gmail.com Date: 2016-03-25 (Fri, 25 Mar 2016)

Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/workflow/modules.py

Log Message: ----------- Fix PJA creation in tool bursting threads.

Potentially fixes #1657.

Commit: 948a4aa55bf9409a69b7af75b9987d60f09890f3 https://github.com/galaxyproject/galaxy/commit/948a4aa55bf9409a69b7af75b9987... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2016-03-25 (Fri, 25 Mar 2016)

Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/workflow/modules.py

Log Message: ----------- Merge pull request #2013 from jmchilton/fix_1657_stable

[16.01] Fix PJA creation in tool bursting threads.

Commit: e6d3529b4c85708bb0b1fbea32e8ce36921e60e1 https://github.com/galaxyproject/galaxy/commit/e6d3529b4c85708bb0b1fbea32e8c... Author: John Chilton jmchilton@gmail.com Date: 2016-03-28 (Mon, 28 Mar 2016)

Changed paths: M lib/galaxy/jobs/__init__.py

Log Message: ----------- [16.01] Fix for running jobs when metadata tool is not in toolbox.

Happens when -installed or -migrated are passed into run_tests.sh because of the way the tool shed hacks up Galaxy's tool config.

Commit: 68ca4b9237a5c44a88377c32cecc9014013c32cc https://github.com/galaxyproject/galaxy/commit/68ca4b9237a5c44a88377c32cecc9... Author: Björn Grüning bjoern@gruenings.eu Date: 2016-03-29 (Tue, 29 Mar 2016)

Changed paths: M lib/galaxy/jobs/__init__.py

Log Message: ----------- Merge pull request #2024 from jmchilton/metadata_tool_fix

[16.01] Fix for running jobs when metadata tool is not in toolbox.

Commit: 7b2a2b1ef1154699d064482ffc41b4d3b6efdabb https://github.com/galaxyproject/galaxy/commit/7b2a2b1ef1154699d064482ffc41b... Author: John Chilton jmchilton@gmail.com Date: 2016-03-29 (Tue, 29 Mar 2016)

Changed paths: M test/unit/test_lazy_process.py

Log Message: ----------- [16.01] More robust test_lazy_process.

Hopefully this will fix a transiently failing test (I've only seen in fail on OS X).

Commit: 7c94ac8d93b8c7fd2dd2f18d3939fa23a1589ad9 https://github.com/galaxyproject/galaxy/commit/7c94ac8d93b8c7fd2dd2f18d3939f... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2016-03-29 (Tue, 29 Mar 2016)

Changed paths: M test/unit/test_lazy_process.py

Log Message: ----------- Merge pull request #2032 from jmchilton/lazy_process_test_fix

[16.01] More robust test_lazy_process.

Commit: d15b1030c5bad75f41e46bdc38d860ebb35bd4fe https://github.com/galaxyproject/galaxy/commit/d15b1030c5bad75f41e46bdc38d86... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-29 (Tue, 29 Mar 2016)

Changed paths: M client/galaxy/scripts/viz/trackster/tracks.js M lib/galaxy/model/__init__.py M lib/galaxy/webapps/galaxy/api/datasets.py M lib/galaxy/workflow/modules.py M static/maps/viz/trackster/tracks.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/viz/trackster/tracks.js M test/unit/test_lazy_process.py

Log Message: ----------- Merge, rebuild.

Compare: https://github.com/galaxyproject/galaxy/compare/d693aaf624ce...d15b1030c5ba