diff options
author | sebres <serg.brester@sebres.de> | 2017-06-16 09:35:27 +0200 |
---|---|---|
committer | sebres <serg.brester@sebres.de> | 2017-06-16 09:35:27 +0200 |
commit | d2c39d2e457ec37bd769b70303ac9df0147ba8c4 (patch) | |
tree | c12c21cbedffddd00fdcccab41775da89296d6f1 /MANIFEST | |
parent | 8403eab2c4d71c8662a58ae5fda642aca473ba36 (diff) | |
parent | bb283776d75bfd9bf2cdecb31b861c170c7d2f53 (diff) | |
download | fail2ban-d2c39d2e457ec37bd769b70303ac9df0147ba8c4.tar.gz |
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)
Diffstat (limited to 'MANIFEST')
-rw-r--r-- | MANIFEST | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |