Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 7ca03bbf047d989359dcf1eee460e4586e200f54 https://github.com/galaxyproject/galaxy/commit/7ca03bbf047d989359dcf1eee460e... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-03-02 (Wed, 02 Mar 2016)
Changed paths: M lib/galaxy/queue_worker.py M lib/galaxy/tools/toolbox/base.py
Log Message: ----------- Fix typos.
Commit: 501a10c3f1ab7102e0a83d4afdd97f78a1a0bc21 https://github.com/galaxyproject/galaxy/commit/501a10c3f1ab7102e0a83d4afdd97... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-03-02 (Wed, 02 Mar 2016)
Changed paths: M lib/galaxy/datatypes/tabular.py M lib/galaxy/external_services/result_handlers/basic.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/managers/context.py M lib/galaxy/model/metadata.py M lib/galaxy/model/search.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/actions/metadata.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/imp_exp/export_history.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/util/__init__.py M lib/galaxy/util/dbkeys.py M lib/galaxy/util/json.py M lib/galaxy/visualization/data_providers/basic.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/visualization/genomes.py M lib/galaxy/visualization/plugins/resource_parser.py M lib/galaxy/web/framework/decorators.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/data_manager.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/page.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/workflow/modules.py M lib/tool_shed/grids/repository_grids.py M lib/tool_shed/util/readme_util.py M lib/tool_shed/util/workflow_util.py M scripts/functional_tests.py M scripts/transfer.py M test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py M test/tool_shed/base/twilltestcase.py M tools/data_source/upload.py
Log Message: ----------- Do not import dumps and loads from galaxy.util.json .
Commit: b4eae046cd759a906ccf1e8cd9297a5dc305f57d https://github.com/galaxyproject/galaxy/commit/b4eae046cd759a906ccf1e8cd9297... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-04 (Fri, 04 Mar 2016)
Changed paths: M lib/galaxy/datatypes/tabular.py M lib/galaxy/external_services/result_handlers/basic.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/managers/context.py M lib/galaxy/model/metadata.py M lib/galaxy/model/search.py M lib/galaxy/queue_worker.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/actions/metadata.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/imp_exp/export_history.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/util/__init__.py M lib/galaxy/util/dbkeys.py M lib/galaxy/util/json.py M lib/galaxy/visualization/data_providers/basic.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/visualization/genomes.py M lib/galaxy/visualization/plugins/resource_parser.py M lib/galaxy/web/framework/decorators.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/data_manager.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/page.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/workflow/modules.py M lib/tool_shed/grids/repository_grids.py M lib/tool_shed/util/readme_util.py M lib/tool_shed/util/workflow_util.py M scripts/functional_tests.py M scripts/transfer.py M test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py M test/tool_shed/base/twilltestcase.py M tools/data_source/upload.py
Log Message: ----------- Merge pull request #1840 from nsoranzo/galaxy_util_json
Do not import dumps and loads from galaxy.util.json .
Compare: https://github.com/galaxyproject/galaxy/compare/84daaec66e87...b4eae046cd75