Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 293726c57933cb2465a650d005332241eac0f912 https://github.com/galaxyproject/galaxy/commit/293726c57933cb2465a650d005332... Author: Nate Coraor <nate@bx.psu.edu> Date: 2017-03-03 (Fri, 03 Mar 2017) Changed paths: M config/galaxy.ini.sample M config/plugins/interactive_environments/bam_iobio/config/bam_iobio.ini.sample M config/plugins/interactive_environments/jupyter/config/jupyter.ini.sample M config/plugins/interactive_environments/neo/config/neo.ini.sample M config/plugins/interactive_environments/phinch/config/phinch.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample A cron/clean_docker_swarm_mode_services.sh M doc/source/admin/interactive_environments.rst M lib/galaxy/config.py M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Support Docker Engine swarm mode Commit: 4aec70cae28f336212a6bc8f5d24a325cb851bab https://github.com/galaxyproject/galaxy/commit/4aec70cae28f336212a6bc8f5d24a... Author: John Chilton <jmchilton@gmail.com> Date: 2017-03-03 (Fri, 03 Mar 2017) Changed paths: M config/galaxy.ini.sample M config/plugins/interactive_environments/bam_iobio/config/bam_iobio.ini.sample M config/plugins/interactive_environments/jupyter/config/jupyter.ini.sample M config/plugins/interactive_environments/neo/config/neo.ini.sample M config/plugins/interactive_environments/phinch/config/phinch.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample A cron/clean_docker_swarm_mode_services.sh M doc/source/admin/interactive_environments.rst M lib/galaxy/config.py M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Merge pull request #3666 from natefoo/docker-swarm-mode Support Docker Engine swarm mode for Interactive Environments Compare: https://github.com/galaxyproject/galaxy/compare/bb604e65ee0f...4aec70cae28f