Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3b31f23eb6a69ea4e4a35e02745444910635da75 https://github.com/galaxyproject/galaxy/commit/3b31f23eb6a69ea4e4a35e0274544... Author: John Chilton <jmchilton@gmail.com> Date: 2016-04-04 (Mon, 04 Apr 2016) Changed paths: M lib/galaxy/tools/deps/commands.py M lib/galaxy/tools/deps/conda_util.py M test/unit/tools/test_conda_resolution.py Log Message: ----------- Fix deps.command.download_command on Mac OS X. Previously -O- and --recursive would be used together - this doesn't seem to be possible on Mac OS X. See issue https://github.com/galaxyproject/planemo/issues/431. Commit: 4138860bfdaff9cf0fb4cdb0a7ea5068ddf1c5d7 https://github.com/galaxyproject/galaxy/commit/4138860bfdaff9cf0fb4cdb0a7ea5... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-04-05 (Tue, 05 Apr 2016) Changed paths: M lib/galaxy/tools/deps/commands.py M lib/galaxy/tools/deps/conda_util.py M test/unit/tools/test_conda_resolution.py Log Message: ----------- Merge pull request #2075 from jmchilton/conda_download_fixes Fix deps.command.download_command on Mac OS X. Compare: https://github.com/galaxyproject/galaxy/compare/d6d216c92efb...4138860bfdaf