Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9d467ddd5204deafb3a0dadae7813691e24c7c3c https://github.com/galaxyproject/galaxy/commit/9d467ddd5204deafb3a0dadae7813... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-09 (Tue, 09 Aug 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/tools/deps/__init__.py Log Message: ----------- enable conda_auto_init in sample, adjust wording Commit: fd3c8753706491e1f6c261d58f42842bfe2757ec https://github.com/galaxyproject/galaxy/commit/fd3c8753706491e1f6c261d58f428... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-09 (Tue, 09 Aug 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Fix string substitution Commit: 730233f48a4ba64c338969036845b0d2aeea5035 https://github.com/galaxyproject/galaxy/commit/730233f48a4ba64c338969036845b... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-09 (Tue, 09 Aug 2016) Changed paths: M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #15 from mvdbeek/fix_string_substitution Fix string substitution Commit: e35c6295694c4065fc880e00fabe43f0c1905748 https://github.com/galaxyproject/galaxy/commit/e35c6295694c4065fc880e00fabe4... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-08-10 (Wed, 10 Aug 2016) Changed paths: M .ci/first_startup.sh Log Message: ----------- Extend startup time Commit: 702891e3efc79fa75ed8e7475e712760355d825c https://github.com/galaxyproject/galaxy/commit/702891e3efc79fa75ed8e7475e712... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-10 (Wed, 10 Aug 2016) Changed paths: M .ci/first_startup.sh Log Message: ----------- Merge pull request #16 from mvdbeek/fix_string_substitution Extend startup time Commit: a7be24e111de2c37c52af580c8a776ee0478ec92 https://github.com/galaxyproject/galaxy/commit/a7be24e111de2c37c52af580c8a77... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-08-11 (Thu, 11 Aug 2016) Changed paths: M .ci/first_startup.sh M config/galaxy.ini.sample M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #2759 from martenson/conda_config [16.07] install Conda at startup; enable conda_auto_init in sample conf Commit: 4ffbedd844b077b48c09092ed0d406ab73060148 https://github.com/galaxyproject/galaxy/commit/4ffbedd844b077b48c09092ed0d40... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-08-11 (Thu, 11 Aug 2016) Changed paths: M .ci/first_startup.sh M config/galaxy.ini.sample M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge branch 'release_16.07' into dev Compare: https://github.com/galaxyproject/galaxy/compare/13b8067d91f8...4ffbedd844b0