diff options
| author | Marian Beermann <public@enkore.de> | 2017-01-12 15:01:41 +0100 |
|---|---|---|
| committer | Marian Beermann <public@enkore.de> | 2017-01-12 15:01:41 +0100 |
| commit | ecad0ed53a70286f01d0437e5fd3e56073e81a74 (patch) | |
| tree | d0a33d2d612b0a6c48ca3de4f219feb97a43944b /tox.ini | |
| parent | 745a3a5753a3932c565c63ca2774af8a2849ee8f (diff) | |
| parent | 9c42a75831e8cbf1218005224f5b835976ad254e (diff) | |
Merge branch '1.0-maint' into merge/1.0-maint
# Conflicts: ... everywhere ...
# .travis.yml
# Vagrantfile
# borg/testsuite/key.py
# docs/changes.rst
# docs/quickstart.rst
# docs/usage.rst
# docs/usage/upgrade.rst.inc
# src/borg/archive.py
# src/borg/archiver.py
# src/borg/crypto.pyx
# src/borg/helpers.py
# src/borg/key.py
# src/borg/remote.py
# src/borg/repository.py
# src/borg/testsuite/archive.py
# src/borg/testsuite/archiver.py
# src/borg/testsuite/crypto.py
# src/borg/testsuite/helpers.py
# src/borg/testsuite/repository.py
# src/borg/upgrader.py
# tox.ini
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -9,7 +9,7 @@ deps = -rrequirements.d/development.txt -rrequirements.d/attic.txt -rrequirements.d/fuse.txt -commands = py.test -rs --cov=borg --cov-config=.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite} +commands = py.test -n 8 -rs --cov=borg --cov-config=.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite} # fakeroot -u needs some env vars: passenv = * |