Branch: refs/heads/reorg Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 19846e3ebdd8597e9e21d9e6a4f3ec0c13b8491c https://github.com/galaxyproject/usegalaxy-playbook/commit/19846e3ebdd8597e9... Author: Martin Cech marten@bx.psu.edu Date: 2017-05-30 (Tue, 30 May 2017)

Changed paths: M env/main/templates/galaxy/config/job_conf.xml.j2

Log Message: ----------- give salmon 16gb and rna_Star 64

Commit: 9c6af8b03364613a7873fb91407893b55ce6fcb0 https://github.com/galaxyproject/usegalaxy-playbook/commit/9c6af8b03364613a7... Author: Nate Coraor nate@bx.psu.edu Date: 2017-05-30 (Tue, 30 May 2017)

Changed paths: M env/common/files/galaxy/dynamic_rules/multi_dynamic_walltime.py M env/main/files/galaxy/galaxy_version.yml M env/main/files/galaxy/var/integrated_tool_panel.xml M env/main/files/galaxy/var/shed_data_manager_conf.xml M env/main/files/galaxy/var/shed_tool_data_table_conf.xml

Log Message: ----------- Fix walltime exception for align families running on local cluster and update Main

Conflicts: production/galaxy_version.yml

Compare: https://github.com/galaxyproject/usegalaxy-playbook/compare/376b8c62fac4...9...