Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: bd96bc4406cc67bc067eeffaf5af66f1f52ea11f https://github.com/galaxyproject/usegalaxy-playbook/commit/bd96bc4406cc67bc0... Author: Nate Coraor nate@bx.psu.edu Date: 2017-04-04 (Tue, 04 Apr 2017)

Changed paths: R bootstrap-ansible.bash

Log Message: ----------- Drop the bootstrap script

Commit: 9ae7ebd5030a611879af50da0123089c621c73ad https://github.com/galaxyproject/usegalaxy-playbook/commit/9ae7ebd5030a61187... Author: Nate Coraor nate@bx.psu.edu Date: 2017-04-18 (Tue, 18 Apr 2017)

Changed paths: M production/files/interactive_environments/plugins/bam_iobio/config/bam_iobio.ini.sample M production/files/interactive_environments/plugins/bam_iobio/static/js/bam_iobio.js M production/files/interactive_environments/plugins/bam_iobio/templates/bam_iobio.mako M production/files/interactive_environments/plugins/common/templates/ie.mako R production/files/interactive_environments/plugins/ethercalc/config/allowed_images.yml.sample R production/files/interactive_environments/plugins/ethercalc/config/ethercalc.ini.sample R production/files/interactive_environments/plugins/ethercalc/config/ethercalc.xml R production/files/interactive_environments/plugins/ethercalc/static/js/ethercalc.js R production/files/interactive_environments/plugins/ethercalc/templates/ethercalc.mako M production/files/interactive_environments/plugins/jupyter/config/allowed_images.yml.sample M production/files/interactive_environments/plugins/jupyter/config/jupyter.ini.sample M production/files/interactive_environments/plugins/jupyter/config/jupyter.xml M production/files/interactive_environments/plugins/jupyter/static/js/jupyter.js M production/files/interactive_environments/plugins/jupyter/templates/jupyter.mako M production/files/interactive_environments/plugins/neo/config/neo.ini.sample M production/files/interactive_environments/plugins/neo/static/js/neo.js M production/files/interactive_environments/plugins/neo/templates/neo.mako M production/files/interactive_environments/plugins/phinch/config/phinch.ini.sample M production/files/interactive_environments/plugins/phinch/static/js/phinch.js M production/files/interactive_environments/plugins/phinch/templates/phinch.mako M production/files/interactive_environments/plugins/rstudio/config/rstudio.ini.sample M production/files/interactive_environments/plugins/rstudio/static/js/rstudio.js M production/files/interactive_environments/plugins/rstudio/templates/rstudio.mako M production/files/interactive_environments/proxy/lib/mapper.js M roles/galaxyprojectdotorg.interactive_environments/meta/.galaxy_install_info M roles/galaxyprojectdotorg.interactive_environments/tasks/extract_component.yml M roles/galaxyprojectdotorg.interactive_environments/tasks/synchronize_components.yml M templates/galaxy/usegalaxy.org/config/job_conf.xml.j2

Log Message: ----------- Merge branch 'master' of github.com:/galaxyproject/usegalaxy-playbook

Compare: https://github.com/galaxyproject/usegalaxy-playbook/compare/ccadc26f89c4...9...