Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 8cf990bd7fd8c4941c36c841830f71da364d39c1 https://github.com/galaxyproject/galaxy/commit/8cf990bd7fd8c4941c36c841830f7... Author: John Chilton jmchilton@gmail.com Date: 2016-02-09 (Tue, 09 Feb 2016)
Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/parser/output_collection_def.py M test/unit/tools/test_collect_primary_datasets.py
Log Message: ----------- Revise dbkey handling for discovred datasets.
Newer style <discover_datasets>'s based discovery will default to using input_dbkey the way normal inputs do. Legacy, implicit filename based discovery will continue to use '?' as the default.
This should work for collections and individual extra outputs.
Fixes #1598.
Thanks to @gregvonkuster for finding this issue and documenting it so thoroughly.
Commit: d7eb315f721684f279f3a0d59c10fbcb7f20a5c7 https://github.com/galaxyproject/galaxy/commit/d7eb315f721684f279f3a0d59c10f... Author: Martin Cech cech.marten@gmail.com Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths: M lib/galaxy/jobs/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/parser/output_collection_def.py M test/unit/tools/test_collect_primary_datasets.py
Log Message: ----------- Merge pull request #1610 from jmchilton/discovered_dataset_keys
Improve dbkey handling for discovered datasets.
Compare: https://github.com/galaxyproject/galaxy/compare/040fb8185be6...d7eb315f7216