Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4c0993cc420bc5e6a1d315677962d41803a41cd3 https://github.com/galaxyproject/galaxy/commit/4c0993cc420bc5e6a1d315677962d... Author: John Chilton <jmchilton@gmail.com> Date: 2016-02-18 (Thu, 18 Feb 2016) Changed paths: M lib/galaxy/tools/toolbox/base.py Log Message: ----------- Fix updating in-memory tools for tool shed installs into sections. Commit: b4c823f2cd47bd0f75351c820651abfefa1a8472 https://github.com/galaxyproject/galaxy/commit/b4c823f2cd47bd0f75351c820651a... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-02-18 (Thu, 18 Feb 2016) Changed paths: M lib/galaxy/tools/toolbox/base.py Log Message: ----------- Merge pull request #1758 from jmchilton/ts_section_fix [16.01] Fix updating in-memory tools for tool shed installs into sections. Commit: ef9362971920c6561015376d3f604bf6234f2547 https://github.com/galaxyproject/galaxy/commit/ef9362971920c6561015376d3f604... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-02-18 (Thu, 18 Feb 2016) Changed paths: M lib/galaxy/util/__init__.py Log Message: ----------- Fix pretty_print_time_interval for MySQL. Fix #1619. Commit: 6c83fbe24dd0dea35967021c061e975225aeb02b https://github.com/galaxyproject/galaxy/commit/6c83fbe24dd0dea35967021c061e9... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-02-18 (Thu, 18 Feb 2016) Changed paths: M lib/galaxy/util/__init__.py Log Message: ----------- Merge pull request #1761 from nsoranzo/release_15.10_fix_for_1619 [15.10] Fix pretty_print_time_interval for MySQL. Commit: b5e91d23779cc6db491b7d7b1701b25cb10da6fb https://github.com/galaxyproject/galaxy/commit/b5e91d23779cc6db491b7d7b1701b... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-02-19 (Fri, 19 Feb 2016) Changed paths: M lib/galaxy/util/__init__.py Log Message: ----------- Merge branch 'release_15.10' into release_16.01 Conflicts: lib/galaxy/util/__init__.py Commit: 975304ac5919369b08733bf6367f58b1ba8adf03 https://github.com/galaxyproject/galaxy/commit/975304ac5919369b08733bf6367f5... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-02-19 (Fri, 19 Feb 2016) Changed paths: M lib/galaxy/tools/toolbox/base.py M lib/galaxy/util/__init__.py Log Message: ----------- Merge branch 'release_16.01' into dev Compare: https://github.com/galaxyproject/galaxy/compare/5ff028a9d063...975304ac5919