Branch: refs/heads/reorg Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 6cca389e2fa650cb6479eead5b6866b6f3f0622d https://github.com/galaxyproject/usegalaxy-playbook/commit/6cca389e2fa650cb6... Author: Nate Coraor nate@bx.psu.edu Date: 2017-04-17 (Mon, 17 Apr 2017)
Changed paths: M env/common/config.yml M env/common/templates/supervisor/galaxy.j2 M env/common/update.yml M env/test/files/galaxy/var/integrated_tool_panel.xml M env/test/files/interactive_environments/plugins/.ansible_ie_role_current_version A env/test/files/interactive_environments/plugins/ethercalc/config/allowed_images.yml.sample M env/test/files/interactive_environments/plugins/ethercalc/config/ethercalc.ini.sample M env/test/files/interactive_environments/proxy/.ansible_ie_role_current_version M env/test/group_vars/galaxyservers/vars.yml M roles/galaxyprojectdotorg.galaxy/README.md M roles/galaxyprojectdotorg.galaxy/defaults/main.yml M roles/galaxyprojectdotorg.galaxy/meta/.galaxy_install_info M roles/galaxyprojectdotorg.galaxy/tasks/main.yml
Log Message: ----------- IE fixes
Commit: 86cafa4afe3c594cb25340990388f589cac0d3f6 https://github.com/galaxyproject/usegalaxy-playbook/commit/86cafa4afe3c594cb... Author: Nate Coraor nate@bx.psu.edu Date: 2017-04-18 (Tue, 18 Apr 2017)
Changed paths: M env/test/templates/galaxy/config/job_conf.xml.j2
Log Message: ----------- Merge branch 'reorg' of github.com:/galaxyproject/usegalaxy-playbook into reorg
Compare: https://github.com/galaxyproject/usegalaxy-playbook/compare/b56a94393f25...8...