Branch: refs/heads/release_18.01 Home: https://github.com/galaxyproject/galaxy Commit: 6bdd755aafbb008422db46231949ad3c6e4e608f https://github.com/galaxyproject/galaxy/commit/6bdd755aafbb008422db46231949a... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M doc/source/admin/framework_dependencies.rst Log Message: ----------- WIP framework dependencies doc update Commit: fd96864bd6fca8f4ff149ca0ba270ebb164254ac https://github.com/galaxyproject/galaxy/commit/fd96864bd6fca8f4ff149ca0ba270... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M doc/source/admin/framework_dependencies.rst M doc/source/admin/scaling.md R lib/galaxy/dependencies/conda-environment.txt A lib/galaxy/dependencies/conda-file.sh M scripts/common_startup.sh Log Message: ----------- Finish updates to framework dependencies doc Commit: 6333e83a6517830599d17e42707f0bead367d135 https://github.com/galaxyproject/galaxy/commit/6333e83a6517830599d17e42707f0... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M doc/source/admin/framework_dependencies.rst Log Message: ----------- Doc corrections from @nsoranzo Commit: a37b638491bc1d04be266bf9a14852fcfb62c342 https://github.com/galaxyproject/galaxy/commit/a37b638491bc1d04be266bf9a1485... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-02-01 (Thu, 01 Feb 2018) Changed paths: M doc/source/admin/framework_dependencies.rst M doc/source/admin/scaling.md R lib/galaxy/dependencies/conda-environment.txt A lib/galaxy/dependencies/conda-file.sh M scripts/common_startup.sh Log Message: ----------- Merge pull request #5390 from natefoo/framework-dependencies-doc-update [18.01] Update framework dependencies documentation Compare: https://github.com/galaxyproject/galaxy/compare/6b0542f7c287...a37b638491bc