Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2a3b22cf497055a1afc578a1f7aead35f51a0ba2 https://github.com/galaxyproject/galaxy/commit/2a3b22cf497055a1afc578a1f7aea... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2018-11-30 (Fri, 30 Nov 2018)

Changed paths: M config/galaxy.yml.sample M doc/source/admin/galaxy_options.rst

Log Message: ----------- Update galaxy.yml.sample and galaxy_options.rst

with `make config-rebuild` . Follow-up on https://github.com/galaxyproject/galaxy/pull/6776 .

Commit: 4e1618e754f6bc9b28cbd2fc1dc06c2288b1239f https://github.com/galaxyproject/galaxy/commit/4e1618e754f6bc9b28cbd2fc1dc06... Author: Martin Cech marten@bx.psu.edu Date: 2018-11-30 (Fri, 30 Nov 2018)

Changed paths: M config/galaxy.yml.sample M doc/source/admin/galaxy_options.rst

Log Message: ----------- Merge pull request #7064 from nsoranzo/make_config-rebuild

Update ``galaxy.yml.sample`` and ``galaxy_options.rst``

Compare: https://github.com/galaxyproject/galaxy/compare/7183a17efc7c...4e1618e754f6 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

Functionality will be removed from GitHub.com on January 31st, 2019.