Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b396b6383bc89a56e6d37b291cc47a2622d02620 https://github.com/galaxyproject/galaxy/commit/b396b6383bc89a56e6d37b291cc47... Author: roalva1 <roalva1@gmail.com> Date: 2015-05-04 (Mon, 04 May 2015) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- concatenate in one VCF some splitted vcfs whith bcftools Commit: 9599ab6c3851f72261327d5edf2fa2c6d831254e https://github.com/galaxyproject/galaxy/commit/9599ab6c3851f72261327d5edf2fa... Author: John Chilton <jmchilton@gmail.com> Date: 2015-10-05 (Mon, 05 Oct 2015) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Cleanup b396b6383bc89a56e6d37b291cc47a2622d02620 a bit. Use logs instead of print statements, PEP-8 improvements. Commit: 62c7f3ea9a92ab777fc4f7e0995a2db126177e12 https://github.com/galaxyproject/galaxy/commit/62c7f3ea9a92ab777fc4f7e0995a2... Author: John Chilton <jmchilton@gmail.com> Date: 2015-10-05 (Mon, 05 Oct 2015) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Merge branch dev into merge-vcf. Conflicts: lib/galaxy/datatypes/tabular.py Commit: 26be140f28483c7de544fb6aeaf342e834664e29 https://github.com/galaxyproject/galaxy/commit/26be140f28483c7de544fb6aeaf34... Author: John Chilton <jmchilton@gmail.com> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Cleanup vcf.merge some more based on PR comments. Commit: ef84888863ebf27529c892917191dc232e7e931a https://github.com/galaxyproject/galaxy/commit/ef84888863ebf27529c892917191d... Author: John Chilton <jmchilton@gmail.com> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Another vcf.merge fix thanks to @nsoranzo. Commit: 5bb2fcabf4ec493cce5d63601d86c02f01b66e0c https://github.com/galaxyproject/galaxy/commit/5bb2fcabf4ec493cce5d63601d86c... Author: John Chilton <jmchilton@gmail.com> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Remove unused commit. Commit: d309535f687125b81f2cf594889d5bdbb803f964 https://github.com/galaxyproject/galaxy/commit/d309535f687125b81f2cf594889d5... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M lib/galaxy/datatypes/tabular.py Log Message: ----------- Merge pull request #845 from jmchilton/merge-vcf-new Update and cleanup of #209. Compare: https://github.com/galaxyproject/galaxy/compare/903823f2986f...d309535f6871