Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: cd9db0bffa68cec4891f38db77af578757d3b63d https://github.com/galaxyproject/galaxy/commit/cd9db0bffa68cec4891f38db77af5... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-04-19 (Thu, 19 Apr 2018) Changed paths: M lib/tool_shed/tools/data_table_manager.py Log Message: ----------- Provide ToolDataTableManager for backwards compatibility Broken in 7df9dce63d635d66a0a9ce5045135ab49b7ef506 Commit: dbb08fe7620610812189049481740215c12f9eb6 https://github.com/galaxyproject/galaxy/commit/dbb08fe7620610812189049481740... Author: Dannon <dannon.baker@gmail.com> Date: 2018-04-25 (Wed, 25 Apr 2018) Changed paths: M lib/galaxy/version.py Log Message: ----------- Merge pull request #5980 from martenson/version-18.05 [18.05] Update version to 18.05.rc1 Commit: 1b1962ea490cdf3f7ff97bfc0f570235ef8ad7fc https://github.com/galaxyproject/galaxy/commit/1b1962ea490cdf3f7ff97bfc0f570... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2018-04-25 (Wed, 25 Apr 2018) Changed paths: M lib/tool_shed/tools/data_table_manager.py Log Message: ----------- Merge pull request #5924 from mvdbeek/fix_data_managers [18.01] Provide ToolDataTableManager for backwards compatibility Commit: 7d81d2cfcba070558dbb1cb5e7b5be390e797ff3 https://github.com/galaxyproject/galaxy/commit/7d81d2cfcba070558dbb1cb5e7b5b... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M config/local_conda_mapping.yml.sample M doc/source/admin/cluster.md Log Message: ----------- Fix 2 typos in the docs Commit: d5ec01d5da1dfde88090afec6df958dfa98af21c https://github.com/galaxyproject/galaxy/commit/d5ec01d5da1dfde88090afec6df95... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M config/local_conda_mapping.yml.sample M doc/source/admin/cluster.md Log Message: ----------- Merge pull request #5986 from nsoranzo/release_17.09_doc_fixes [17.09] Fix 2 typos in the docs Commit: a3e69636662cfeae0ebc1b66fcc03b0b7fe13be8 https://github.com/galaxyproject/galaxy/commit/a3e69636662cfeae0ebc1b66fcc03... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M config/local_conda_mapping.yml.sample M doc/source/admin/cluster.md Log Message: ----------- Merge branch 'release_17.09' into release_18.01 Commit: 7ce49394c3a73fc64e23603ffcab8f39ff3159a0 https://github.com/galaxyproject/galaxy/commit/7ce49394c3a73fc64e23603ffcab8... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M config/local_conda_mapping.yml.sample M doc/source/admin/cluster.md M lib/tool_shed/tools/data_table_manager.py Log Message: ----------- Merge branch 'release_18.01' into release_18.05 Commit: 7d9c085b03d477fa8322e140732d4d1c804d6a6a https://github.com/galaxyproject/galaxy/commit/7d9c085b03d477fa8322e140732d4... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M config/local_conda_mapping.yml.sample M doc/source/admin/cluster.md M lib/tool_shed/tools/data_table_manager.py Log Message: ----------- Merge branch 'release_18.05' into dev Compare: https://github.com/galaxyproject/galaxy/compare/7580a28b3917...7d9c085b03d4