Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

biopet.biopet
- Activity
- Members
- Environments

Snippets Groups Projects

8ad8f6c9

Commit 8ad8f6c9 authored 8 years ago by Peter van 't Hof

Downloads
- Plain Diff

Merge branch 'develop' into feature-centrifuge_pipe

parents ff5e56e1 0cea2b66

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala 14 additions, 0 deletions

...c/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala
biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala 1 addition, 0 deletions

...main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala
biopet-tools/src/main/scala/nl/lumc/sasc/biopet/tools/VcfWithVcf.scala 58 additions, 5 deletions

...src/main/scala/nl/lumc/sasc/biopet/tools/VcfWithVcf.scala
biopet-tools/src/test/resources/chrQ_monoallelic.vcf 79 additions, 0 deletions

biopet-tools/src/test/resources/chrQ_monoallelic.vcf
biopet-tools/src/test/resources/chrQ_monoallelic.vcf.gz 0 additions, 0 deletions

biopet-tools/src/test/resources/chrQ_monoallelic.vcf.gz
biopet-tools/src/test/resources/chrQ_monoallelic.vcf.gz.tbi 0 additions, 0 deletions

biopet-tools/src/test/resources/chrQ_monoallelic.vcf.gz.tbi
biopet-tools/src/test/resources/chrQ_multiallelic.vcf 79 additions, 0 deletions

biopet-tools/src/test/resources/chrQ_multiallelic.vcf
biopet-tools/src/test/resources/chrQ_multiallelic.vcf.gz 0 additions, 0 deletions

biopet-tools/src/test/resources/chrQ_multiallelic.vcf.gz
biopet-tools/src/test/resources/chrQ_multiallelic.vcf.gz.tbi 0 additions, 0 deletions

biopet-tools/src/test/resources/chrQ_multiallelic.vcf.gz.tbi
biopet-tools/src/test/scala/nl/lumc/sasc/biopet/tools/VcfWithVcfTest.scala 59 additions, 11 deletions

...test/scala/nl/lumc/sasc/biopet/tools/VcfWithVcfTest.scala

with 290 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment