Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 20f98df554f502bddff1f22879bf867f97ab7288 https://github.com/galaxyproject/galaxy/commit/20f98df554f502bddff1f22879bf8... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M lib/galaxy/jobs/runners/cli.py Log Message: ----------- Finish job for Torque SSH runner Commit: 61d25720661cb120afc7b44c57f41a1b245e21e4 https://github.com/galaxyproject/galaxy/commit/61d25720661cb120afc7b44c57f41... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M lib/galaxy/jobs/runners/cli.py Log Message: ----------- More explcit logging of CLI runner state change (thx @nsoranzo) Commit: a3ac57dbc532320c98e0b4a72772663293ab3b06 https://github.com/galaxyproject/galaxy/commit/a3ac57dbc532320c98e0b4a727726... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Remove verbose_install_check option This option was introduced with #2554 and #2538, in reponse to a false positive conda install. This would have been caught by simply checking the exit code, which we are doing by default now. The additional verification is too strigent and not in line with the conda resolver. Activating this option will report perfectly well installed conda environments as having failed and will cause them to be uninstalled. Commit: d144f18e7a6eaa5276b2d63f51457eda1befd679 https://github.com/galaxyproject/galaxy/commit/d144f18e7a6eaa5276b2d63f51457... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Fix typo in GIE nginx proxy docs Commit: b748ad1565a1e5064f6e08640c19b09a41b4b2bc https://github.com/galaxyproject/galaxy/commit/b748ad1565a1e5064f6e08640c19b... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Merge pull request #3157 from galaxyproject/gie-doc-fix [16.07] Fix typo in GIE nginx proxy docs Commit: ae3bdf31dc815dfce305316fe67776bc6802ec1a https://github.com/galaxyproject/galaxy/commit/ae3bdf31dc815dfce305316fe6777... Author: John Chilton <jmchilton@gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge pull request #3127 from mvdbeek/remove_verbose_install_check_16.07 [16.07] Remove verbose_install_check option Commit: 727270261750fc71979e7ba9fec96b10091ff104 https://github.com/galaxyproject/galaxy/commit/727270261750fc71979e7ba9fec96... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-11-14 (Mon, 14 Nov 2016) Changed paths: M lib/galaxy/jobs/runners/cli.py Log Message: ----------- Merge pull request #3085 from mvdbeek/fix_torque_ssh [16.07] Finish job for Torque SSH/CLI runner Commit: ca4e8914ecddbba007c1f65ff17f51e719c0c149 https://github.com/galaxyproject/galaxy/commit/ca4e8914ecddbba007c1f65ff17f5... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-11-14 (Mon, 14 Nov 2016) Changed paths: M config/galaxy.ini.sample M doc/source/admin/interactive_environments.rst M lib/galaxy/jobs/runners/cli.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Merge branch 'release_16.07' into dev Conflicts: lib/galaxy/tools/deps/conda_util.py Compare: https://github.com/galaxyproject/galaxy/compare/bfabe00ea8f0...ca4e8914ecdd