[med-svn] [ariba] 02/03: Merge tag 'upstream/2.2.4+ds'

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

satta pushed a commit to branch master
in repository ariba.

commit 6c74c78ba740963f6dee7e072ed65867760a5eea
Merge: 840da49 a05dfde
Author: Sascha Steinbiss <satta at debian.org>
Date:   Wed Aug 24 08:14:04 2016 +0000

    Merge tag 'upstream/2.2.4+ds'
    
    Upstream version 2.2.4+ds

 ariba/reference_data.py                            |   2 +-
 ariba/report.py                                    |  48 +++-
 ariba/report_filter.py                             |   4 +-
 ariba/summary_cluster_variant.py                   |  10 +-
 ariba/tests/cluster_test.py                        |  25 +-
 ...luster_full_run_smtls_known_snp_presabs_nonc.fa |   3 +
 ...uster_full_run_smtls_known_snp_presabs_nonc.tsv |   2 +
 .../reads_1.fq                                     | 296 +++++++++++++++++++++
 .../reads_2.fq                                     | 296 +++++++++++++++++++++
 .../references.fa                                  |   3 +
 ariba/tests/reference_data_test.py                 |   4 +-
 ariba/tests/report_filter_test.py                  |   3 +-
 ariba/tests/summary_cluster_variant_test.py        |   5 +-
 setup.py                                           |   4 +-
 14 files changed, 676 insertions(+), 29 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ariba.git