From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 25 May 2018 14:48:15 +0000 (+0200)
Subject: Merge branch 'ci-docker-update' into 'master'
X-Git-Tag: v2.4.0~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa3f907b167b50ca0e9e23f4bf115fa2aa7564d;p=thirdparty%2Fknot-resolver.git

Merge branch 'ci-docker-update' into 'master'

ci: add pytest-xdist dependency for Deckard

See merge request knot/knot-resolver!590
---

afa3f907b167b50ca0e9e23f4bf115fa2aa7564d