Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: e162ff44229afc5f01d49d74ef4bf793b32b4f1f https://github.com/galaxyproject/usegalaxy-playbook/commit/e162ff44229afc5f0... Author: Nate Coraor nate@bx.psu.edu Date: 2015-04-30 (Thu, 30 Apr 2015)

Changed paths: M files/galaxy/usegalaxy.org/config/job_resource_params_conf.xml R files/galaxy/usegalaxy.org/dynamic_rules/local_stampede_select.py A files/galaxy/usegalaxy.org/dynamic_rules/multi_dynamic_walltime.py M production/group_vars/all.yml M production/group_vars/galaxyservers.yml M templates/galaxy/usegalaxy.org/config/job_conf.xml.j2

Log Message: ----------- Updated Main to 15.05 rc1, enabled walltime resubmission to Stampede.