Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 07cf96c26053d8a0d0fe1a6365f6bf4272a3593d https://github.com/galaxyproject/galaxy/commit/07cf96c26053d8a0d0fe1a6365f6b... Author: Enis Afgan <afgane@gmail.com> Date: 2016-09-01 (Thu, 01 Sep 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Update Conda FAQ Commit: ecdbf4d0b579f4dbae79a56aea1398224d9f2c93 https://github.com/galaxyproject/galaxy/commit/ecdbf4d0b579f4dbae79a56aea139... Author: Enis Afgan <afgane@gmail.com> Date: 2016-09-01 (Thu, 01 Sep 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Address PR #2891 comments Commit: 3cee333011bff6aed673429f361659132804f33c https://github.com/galaxyproject/galaxy/commit/3cee333011bff6aed673429f36165... Author: Enis Afgan <afgane@gmail.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M lib/galaxy/tools/cwl/parser.py Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into dev Commit: 97b748c73a4eb169c5e1c6894ea2b30dbcc0343a https://github.com/galaxyproject/galaxy/commit/97b748c73a4eb169c5e1c6894ea2b... Author: Enis Afgan <afgane@gmail.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Shorten Conda environment naming as per https://github.com/galaxyproject/galaxy/commit/e9d81500caa3526200b204270aca1... Thanks @lparsons. Commit: 2b6b5c82754a3ca9722e55d9828042e70d95d028 https://github.com/galaxyproject/galaxy/commit/2b6b5c82754a3ca9722e55d982804... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Merge pull request #2891 from afgane/dev Update Conda FAQ Compare: https://github.com/galaxyproject/galaxy/compare/a199590efa23...2b6b5c82754a