Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: fc027124e73ee391e4b4045b2abc68fd942f910c https://github.com/galaxyproject/galaxy/commit/fc027124e73ee391e4b4045b2abc6... Author: Peter Cock p.j.a.cock@googlemail.com Date: 2016-10-26 (Wed, 26 Oct 2016)

Changed paths: M config/tool_data_table_conf.xml.sample

Log Message: ----------- Fix BLAST database *.loc files inconsistency

We should have all of the ``blast*.loc`` files in the sample configuration, or none of them.

Historically Galaxy included only the nucleotide BLAST database ``blastdb.loc`` file for use with mega-blast, with ``blastdb_p.loc`` later for protein databases added as part of the BLAST+ suite (which initially was in the main Galaxy repository).

In a3018feb028658fc3a7071803b7b49cb575e7358 the mega-blast tool was moved to the Tool Shed, and the ``blastdb.loc`` entry removed. Likewise the BLAST+ tools were moved to the Tool Shed, but the ``blastdb_p.loc`` entry remains.

Later (on the Tool Shed only?) ``blastdb_d.loc``was added for protein domain databases.

Commit: 90d143cda16d7c7a0938e255c08bf9db7fea727c https://github.com/galaxyproject/galaxy/commit/90d143cda16d7c7a0938e255c08bf... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-10-26 (Wed, 26 Oct 2016)

Changed paths: M config/tool_data_table_conf.xml.sample

Log Message: ----------- Merge pull request #3098 from peterjc/patch-6

Fix BLAST database *.loc files inconsistency

Compare: https://github.com/galaxyproject/galaxy/compare/ab42b7b15c50...90d143cda16d