Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3f3c1b679bfef5dbd75d7c267d25fd2979f362d1 https://github.com/galaxyproject/galaxy/commit/3f3c1b679bfef5dbd75d7c267d25f... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample Log Message: ----------- Pin IE versions Commit: 85df2f67c4988700232098d4dc08f2bc5148359d https://github.com/galaxyproject/galaxy/commit/85df2f67c4988700232098d4dc08f... Author: John Chilton <jmchilton@gmail.com> Date: 2015-09-23 (Wed, 23 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample Log Message: ----------- Merge pull request #785 from erasche/pin-gie-images [release_15.07] pin GIE image versions Commit: bf60693ed001099b78189f28d46500b572be9df7 https://github.com/galaxyproject/galaxy/commit/bf60693ed001099b78189f28d4650... Author: John Chilton <jmchilton@gmail.com> Date: 2015-09-24 (Thu, 24 Sep 2015) Changed paths: M lib/galaxy/workflow/run.py Log Message: ----------- Fix problem maintaining input maps when rescheduling workflows. Fixes #776. I suspect the problem has very little to do with dynamic output collections and in fact exhibits itself when workflow rescheduling occurs, it is just that workflow rescheduling is forced when using dynamic output collections. Commit: 0bf60a5205947e4e4f20090a0509474983370df7 https://github.com/galaxyproject/galaxy/commit/0bf60a5205947e4e4f20090a05094... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M lib/galaxy/workflow/run.py Log Message: ----------- Merge pull request #794 from jmchilton/release_15.05.output.fix [15.05] Fix problem maintaining input maps when rescheduling workflows. Commit: e0067455083089dbdf35ac4b93ff94d91b689889 https://github.com/galaxyproject/galaxy/commit/e0067455083089dbdf35ac4b93ff9... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M lib/galaxy/workflow/run.py Log Message: ----------- Merge branch 'release_15.05' into release_15.07 Commit: 79c58bd9250c174ca5347bcc6cdd33f08074cecc https://github.com/galaxyproject/galaxy/commit/79c58bd9250c174ca5347bcc6cdd3... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M lib/galaxy/datatypes/binary.py M lib/galaxy/workflow/run.py Log Message: ----------- Merge branch 'release_15.07' Commit: 0260d753c76d7305f6c1f05d08af43e61faa7641 https://github.com/galaxyproject/galaxy/commit/0260d753c76d7305f6c1f05d08af4... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-09-25 (Fri, 25 Sep 2015) Log Message: ----------- Merge branch 'master' into dev Conflicts: config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample Compare: https://github.com/galaxyproject/galaxy/compare/ba43e95f41c3...0260d753c76d