Merge branch '0.10' into 0.10-full

# Conflicts:
#	fail2ban/server/database.py - resolved and test-case with persistent ban-time fixed/extended (bantime presents in database)
This commit is contained in:
sebres
2017-06-16 09:35:27 +02:00
25 changed files with 419 additions and 43 deletions

View File

@@ -147,6 +147,7 @@ config/filter.d/webmin-auth.conf
config/filter.d/wuftpd.conf
config/filter.d/xinetd-fail.conf
config/jail.conf
config/paths-arch.conf
config/paths-common.conf
config/paths-debian.conf
config/paths-fedora.conf