Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: dedb1d3f4ca83539baea9c4ff5654c3b44614540 https://github.com/galaxyproject/galaxy/commit/dedb1d3f4ca83539baea9c4ff5654... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/histories.py Log Message: ----------- Fix history import by file on multi-handler setups The uploaded archive was going to be deleted before the job started running. Commit: 1cac9ad54fead782a28619ae60b46cdc73491c75 https://github.com/galaxyproject/galaxy/commit/1cac9ad54fead782a28619ae60b46... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/binary.py A lib/galaxy/datatypes/converters/bam_native_to_bam_converter.xml M lib/galaxy/datatypes/converters/bam_to_bigwig_converter.xml A lib/galaxy/datatypes/converters/sam_to_bam_native.xml M lib/galaxy/datatypes/sniff.py M scripts/functional_tests.py A test-data/bam_native_from_sam.bam M test-data/sam_with_header.sam M test/base/driver_util.py A test/functional/tools/sam_to_bam_native.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge branch 'dev' of github.com:galaxyproject/galaxy into dev Compare: https://github.com/galaxyproject/galaxy/compare/8f65cd46b0ec...1cac9ad54fea