Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9e9dfdfd55b2b8d2377f8ef4e288a1fa482105b9 https://github.com/galaxyproject/galaxy/commit/9e9dfdfd55b2b8d2377f8ef4e288a... Author: John Chilton jmchilton@gmail.com Date: 2016-03-21 (Mon, 21 Mar 2016)

Changed paths: M lib/galaxy/workflow/run.py

Log Message: ----------- Fix workflow scheduler log message.

Commit: 5f5f0af5cd5e21c64810d29202e149915226c34a https://github.com/galaxyproject/galaxy/commit/5f5f0af5cd5e21c64810d29202e14... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-21 (Mon, 21 Mar 2016)

Changed paths: M lib/galaxy/workflow/run.py

Log Message: ----------- Merge pull request #1955 from jmchilton/fix_wf_log_message

[16.01] Fix workflow scheduler log message.

Commit: 2efd9c2687d2ca818520249cdb3484e781659069 https://github.com/galaxyproject/galaxy/commit/2efd9c2687d2ca818520249cdb348... Author: John Chilton jmchilton@gmail.com Date: 2016-03-21 (Mon, 21 Mar 2016)

Changed paths: M lib/galaxy/tools/parameters/basic.py

Log Message: ----------- Fix #1721.

TODO: write test...

Commit: 377ccbe23b717f9c8cb0d571de9f0d6da08a1ee8 https://github.com/galaxyproject/galaxy/commit/377ccbe23b717f9c8cb0d571de9f0... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-21 (Mon, 21 Mar 2016)

Changed paths: M lib/galaxy/tools/parameters/basic.py

Log Message: ----------- Merge pull request #1967 from jmchilton/fix_optional_numeric_params

[16.01] Fix #1721.

Commit: 8d37aeff507b2fa16a1164eeb64a771746d4767d https://github.com/galaxyproject/galaxy/commit/8d37aeff507b2fa16a1164eeb64a7... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-21 (Mon, 21 Mar 2016)

Changed paths: M lib/galaxy/tools/parameters/basic.py M lib/galaxy/workflow/run.py

Log Message: ----------- Manual merge to resolve conflict 16.01->dev

Commit: c64c6754a84cfb399a9e3f230f08a6a6294406fa https://github.com/galaxyproject/galaxy/commit/c64c6754a84cfb399a9e3f230f08a... Author: Martin Cech cech.marten@gmail.com Date: 2016-03-21 (Mon, 21 Mar 2016)

Changed paths: M lib/galaxy/tools/parameters/basic.py M lib/galaxy/workflow/run.py

Log Message: ----------- Merge pull request #1969 from dannon/dev

Merge 16.01->dev

Compare: https://github.com/galaxyproject/galaxy/compare/67e6ced2118b...c64c6754a84c