Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 466a2ee61e11b25e4cc4e50a8e0ae8fbf74c472e https://github.com/galaxyproject/usegalaxy-playbook/commit/466a2ee61e11b25e4... Author: Nate Coraor nate@bx.psu.edu Date: 2015-05-13 (Wed, 13 May 2015)
Changed paths: M files/galaxy/test.galaxyproject.org/var/integrated_tool_panel.xml M files/galaxy/test.galaxyproject.org/var/shed_tool_conf.xml M files/galaxy/test.galaxyproject.org/var/shed_tool_data_table_conf.xml
Log Message: ----------- Mutable configs on Test
Commit: fa48a8a5efc2b86a5bc4c21813fc66e78d65faa5 https://github.com/galaxyproject/usegalaxy-playbook/commit/fa48a8a5efc2b86a5... Author: Nate Coraor nate@bx.psu.edu Date: 2015-05-13 (Wed, 13 May 2015)
Changed paths: M files/galaxy/test.galaxyproject.org/config/job_resource_params_conf.xml M files/galaxy/test.galaxyproject.org/dynamic_rules/blacklight_select.py
Log Message: ----------- Add a 128 core (1 TB) option for Blacklight.
Commit: b1af1d3d153122f5144dbf18814f6ac67af63e32 https://github.com/galaxyproject/usegalaxy-playbook/commit/b1af1d3d153122f51... Author: Nate Coraor nate@bx.psu.edu Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths: M files/galaxy/test.galaxyproject.org/var/integrated_tool_panel.xml M files/galaxy/test.galaxyproject.org/var/shed_tool_conf.xml M files/galaxy/test.galaxyproject.org/var/shed_tool_data_table_conf.xml
Log Message: ----------- Mutable configs on Test
Commit: fe327276d36fc97c628bf5855ebf1b315365b9d1 https://github.com/galaxyproject/usegalaxy-playbook/commit/fe327276d36fc97c6... Author: Nate Coraor nate@bx.psu.edu Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths: M files/galaxy/common/dynamic_rules/multi_dynamic_walltime.py M files/galaxy/test.galaxyproject.org/config/job_resource_params_conf.xml M templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2
Log Message: ----------- Create a "testing" resource for increasing core/memory count on Test. Fix a typo in the destination for 16GB jobs.
Commit: 67fb2b927043cc1bf3efb9bad427e53b40ef1203 https://github.com/galaxyproject/usegalaxy-playbook/commit/67fb2b927043cc1bf... Author: Nate Coraor nate@bx.psu.edu Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths: M files/galaxy/common/dynamic_rules/multi_dynamic_walltime.py M files/galaxy/test.galaxyproject.org/config/job_resource_params_conf.xml M files/galaxy/test.galaxyproject.org/var/integrated_tool_panel.xml M files/galaxy/test.galaxyproject.org/var/shed_tool_conf.xml M files/galaxy/test.galaxyproject.org/var/shed_tool_data_table_conf.xml M files/galaxy/usegalaxy.org/var/integrated_tool_panel.xml M files/galaxy/usegalaxy.org/var/migrated_tools_conf.xml M templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2
Log Message: ----------- Merge commit 'fe32727'
Conflicts: files/galaxy/test.galaxyproject.org/var/integrated_tool_panel.xml files/galaxy/test.galaxyproject.org/var/shed_tool_conf.xml files/galaxy/test.galaxyproject.org/var/shed_tool_data_table_conf.xml
Compare: https://github.com/galaxyproject/usegalaxy-playbook/compare/ba06c706bace...6...