Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 70595dbfc1533f3707eca4cc04d9840d308d69af https://github.com/galaxyproject/usegalaxy-playbook/commit/70595dbfc1533f370... Author: Nate Coraor nate@bx.psu.edu Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths: M common/host_vars/athena.galaxyproject.org.yml
Log Message: ----------- Moved some athena stuff to infrastructure-playbook
Commit: 96d7eadf57b018a016cce4e0932964217510a215 https://github.com/galaxyproject/usegalaxy-playbook/commit/96d7eadf57b018a01... Author: Nate Coraor nate@bx.psu.edu Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths: M .gitmodules M README.md M files/galaxy/common/dynamic_rules/multi_dynamic_walltime.py M files/galaxy/common/dynamic_rules/reserved.py A files/galaxy/common/static/welcome_img/GCC2016TrNom.png A files/galaxy/common/static/welcome_img/Riboseq.png A files/galaxy/common/static/welcome_img/WhaleSharkGalaxy.png M files/galaxy/test.galaxyproject.org/config/job_resource_params_conf.xml M files/galaxy/test.galaxyproject.org/config/tool_conf.xml R files/galaxy/test.galaxyproject.org/dynamic_rules/blacklight_select.py A files/galaxy/test.galaxyproject.org/dynamic_rules/greenfield_select.py R files/galaxy/test.galaxyproject.org/nagios/echo_test_blacklight.xml A files/galaxy/test.galaxyproject.org/nagios/echo_test_greenfield.xml A files/galaxy/test.galaxyproject.org/tool_list.yaml 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 A files/galaxy/usegalaxy.org/tool_list.yaml M files/galaxy/usegalaxy.org/var/shed_tool_conf.xml M galaxy.yml M production/group_vars/all.yml M production/group_vars/galaxyservers.yml M production/group_vars/pulsarservers.yml M production/group_vars/toolshedservers.yml M production/host_vars/login5.stampede.tacc.utexas.edu.yml A production/secret_host_vars/default.yml A production/secret_host_vars/login5.stampede.tacc.utexas.edu.yml M production/secret_vars/galaxyservers.yml R production/secret_vars/pulsarservers.yml M pulsar.yml M roles/galaxyprojectdotorg.pulsar/README.md M roles/galaxyprojectdotorg.pulsar/defaults/main.yml M roles/galaxyprojectdotorg.pulsar/meta/.galaxy_install_info M roles/galaxyprojectdotorg.pulsar/tasks/main.yml A roles/galaxyprojectdotorg.pulsar/templates/app.yml.j2 M roles/galaxyprojectdotorg.pulsar/templates/server.ini.j2 A roles/galaxyprojectdotorg.tools/LICENSE A roles/galaxyprojectdotorg.tools/README.md A roles/galaxyprojectdotorg.tools/defaults/main.yml A roles/galaxyprojectdotorg.tools/files/README.md A roles/galaxyprojectdotorg.tools/files/dbkeys_list.yaml.sample A roles/galaxyprojectdotorg.tools/files/install_tool_shed_tools.py A roles/galaxyprojectdotorg.tools/files/tool_list.yaml A roles/galaxyprojectdotorg.tools/files/tool_list.yaml.sample A roles/galaxyprojectdotorg.tools/meta/.galaxy_install_info A roles/galaxyprojectdotorg.tools/meta/main.yml A roles/galaxyprojectdotorg.tools/tasks/main.yml A roles/galaxyprojectdotorg.tools/tasks/tools.yml M stage/group_vars/all.yml M stage/group_vars/galaxyservers.yml M stage/group_vars/pulsarservers.yml M stage/group_vars/toolshedservers.yml A stage/host_vars/greenfield.psc.xsede.org.yml M stage/host_vars/login5.stampede.tacc.utexas.edu.yml R stage/host_vars/tg-login2.blacklight.psc.xsede.org.yml M stage/inventory A stage/secret_host_vars/default.yml A stage/secret_host_vars/greenfield.psc.xsede.org.yml A stage/secret_host_vars/login5.stampede.tacc.utexas.edu.yml M stage/secret_vars/galaxyservers.yml R stage/secret_vars/pulsarservers.yml M templates/galaxy/common/static/welcome.html.j2 M templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2 M templates/galaxy/usegalaxy.org/config/job_conf.xml.j2 A tools.yml
Log Message: ----------- Merge branch 'master' of github.com:galaxyproject/usegalaxy-playbook
Compare: https://github.com/galaxyproject/usegalaxy-playbook/compare/85d58d667cd5...9...