Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 50f1089c72ff46397e525d4aa99dc80569081509 https://github.com/galaxyproject/galaxy/commit/50f1089c72ff46397e525d4aa99dc... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-09 (Wed, 09 Mar 2016)

Changed paths: M lib/galaxy/visualization/data_providers/genome.py

Log Message: ----------- Slight tweaks to our tabix usage. This fixes trackster without more divergence in our version of pysam.

Commit: c6f3e9b5b28268cba1ef8d7be5f1bed90b6ecc00 https://github.com/galaxyproject/galaxy/commit/c6f3e9b5b28268cba1ef8d7be5f1b... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-09 (Wed, 09 Mar 2016)

Changed paths: M lib/galaxy/visualization/data_providers/genome.py

Log Message: ----------- Slight cleanup, remove outdated comment regarding tabixfile.close()

Commit: f0b7a34dd3ea5b3b10494c7e186fb10fda30441f https://github.com/galaxyproject/galaxy/commit/f0b7a34dd3ea5b3b10494c7e186fb... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-09 (Wed, 09 Mar 2016)

Changed paths: M lib/galaxy/webapps/galaxy/api/quotas.py

Log Message: ----------- Apply patch from Fabien Mareuil to resolve json serialization of Decimal error; for more see http://dev.list.galaxyproject.org/quota-api-error-td4669081.html

Commit: a351c75687921bb8d2487577c5c4c0a64bee5e5f https://github.com/galaxyproject/galaxy/commit/a351c75687921bb8d2487577c5c4c... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-09 (Wed, 09 Mar 2016)

Changed paths: M lib/galaxy/visualization/data_providers/genome.py

Log Message: ----------- Extra documentation for @mvdbeek

Commit: afb4e9c8f40da5331412c2a8f83ece814fb54b05 https://github.com/galaxyproject/galaxy/commit/afb4e9c8f40da5331412c2a8f83ec... Author: Martin Cech cech.marten@gmail.com Date: 2016-03-10 (Thu, 10 Mar 2016)

Changed paths: M lib/galaxy/visualization/data_providers/genome.py

Log Message: ----------- Merge pull request #1897 from dannon/pysam_compat

[16.01] Slight tweaks to our tabix usage.

Commit: 3abd2c213ae508bd3547d08729c96bbff4a5b740 https://github.com/galaxyproject/galaxy/commit/3abd2c213ae508bd3547d08729c96... Author: Martin Cech cech.marten@gmail.com Date: 2016-03-10 (Thu, 10 Mar 2016)

Changed paths: M lib/galaxy/webapps/galaxy/api/quotas.py

Log Message: ----------- Merge pull request #1898 from dannon/quota_api_fix_fabien

[16.01] Quota API issue with serialization to JSON of Decimal

Commit: 8423fe74dfc3b5effa70e771fd6a58df01b85d02 https://github.com/galaxyproject/galaxy/commit/8423fe74dfc3b5effa70e771fd6a5... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-03-11 (Fri, 11 Mar 2016)

Changed paths: M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/webapps/galaxy/api/quotas.py

Log Message: ----------- Merge branch 'release_16.01' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/dd07156e1109...8423fe74dfc3