Branch: refs/heads/release_17.01 Home: https://github.com/galaxyproject/galaxy Commit: 840c3b0fd846ea5fb58fb34378717aeadea7e81a https://github.com/galaxyproject/galaxy/commit/840c3b0fd846ea5fb58fb34378717... Author: John Chilton <jmchilton@gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M test/integration/test_resolvers.py Log Message: ----------- Fix integration test for default Conda mapping. It worked locally simply because I had R already installed on my system globally. Commit: 2322bc1ff59e85fb4f9db281d04b96e124dd73aa https://github.com/galaxyproject/galaxy/commit/2322bc1ff59e85fb4f9db281d04b9... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2017-02-02 (Thu, 02 Feb 2017) Changed paths: M test/integration/test_resolvers.py Log Message: ----------- Merge pull request #3541 from jmchilton/backport_3508 [17.01] Fix integration test for default Conda mapping. Compare: https://github.com/galaxyproject/galaxy/compare/da0affd45d4f...2322bc1ff59e