Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 5ccdca872d0821f0cac607105e852ec16de18468 https://github.com/galaxyproject/usegalaxy-playbook/commit/5ccdca872d0821f0c... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-12-07 (Mon, 07 Dec 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 M stage/files/interactive_environments/plugins/.ansible_ie_role_current_version A stage/files/interactive_environments/plugins/bam_iobio/config/bam_iobio.ini.sample A stage/files/interactive_environments/plugins/bam_iobio/config/bam_iobio.xml A stage/files/interactive_environments/plugins/bam_iobio/static/js/bam_iobio.js A stage/files/interactive_environments/plugins/bam_iobio/templates/bam_iobio.mako M stage/files/interactive_environments/plugins/common/templates/ie.mako M stage/files/interactive_environments/plugins/ipython/config/ipython.ini.sample M stage/files/interactive_environments/plugins/ipython/static/js/ipython.js M stage/files/interactive_environments/plugins/rstudio/static/js/rstudio.js M stage/files/interactive_environments/proxy/.ansible_ie_role_current_version M stage/group_vars/all.yml Log Message: ----------- Update Test Commit: 5757ee61c1a6cf4c6972451191da20555be33162 https://github.com/galaxyproject/usegalaxy-playbook/commit/5757ee61c1a6cf4c6... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: A files/galaxy/common/static/welcome_img/Barcelona_2015.png A files/galaxy/common/static/welcome_img/MPI-HLR-Galaxy.png M stage/group_vars/all.yml M stage/group_vars/toolshedservers.yml M templates/galaxy/common/static/welcome.html.j2 M templates/supervisor/toolshed.conf.j2 Log Message: ----------- Merge branch 'master' of github.com:galaxyproject/usegalaxy-playbook Conflicts: stage/group_vars/all.yml Compare: https://github.com/galaxyproject/usegalaxy-playbook/compare/0db21fc8feab...5...