diff options
author | Yaroslav Halchenko <debian@onerussian.com> | 2013-05-08 13:43:45 -0400 |
---|---|---|
committer | Yaroslav Halchenko <debian@onerussian.com> | 2013-05-08 13:53:38 -0400 |
commit | f1b6806eb482b1e52f002ad07c71f4d6443b21ec (patch) | |
tree | 51f147259dd1c0b871f1f31377ecb3a1dbe58753 /fail2ban/__init__.py | |
parent | 93ad298aa89d9982cee988a6bd085f8b67973ae0 (diff) | |
parent | 2b1e19933f41e01723b7dd734a2e8242a18e5ec6 (diff) | |
download | fail2ban-f1b6806eb482b1e52f002ad07c71f4d6443b21ec.tar.gz |
Merge branch 'master' into 0.9
* master: (51 commits)
ENH: Use real (resolving) example.com instead of test.example.com
DOC: Slight tune ups to ChangeLog -- we must release!
Changelog entries for the latest merges
BF: add bash-completion to MANIFEST
DOC: ChangeLog for default action type change
ENH: consolidate where blocktype is defined for iptables rules
BF: default type to unreachable
ENH: separate out regex and escape a .
ENH: logs/sshd -- have ":" after [daemon] (other uses are uncommon)
ENH: logs/sshd -- use example.com as the resolved hostname in sample log lines
ENH: filter.d/sshd.conf -- allow for trailing "via IP" in logs
DOC: Drop sudo from bash-completion
DOC: Added bash-completion script
ENH: add blocktype to all relevant actions. Also default the rejection to a ICMP reject rather than a drop
ENH: Removed unused log line
ENH: logrotate file
BF: missed MANIFEST include
BF: missed MANIFEST include
BF: missed MANIFEST include
ENH: some form of logrotate based on what distros are doing
...
Conflicts:
ChangeLog
MANIFEST
client/actionreader.py
config/jail.conf
fail2ban/server/datedetector.py
fail2ban/tests/datedetectortestcase.py
Diffstat (limited to 'fail2ban/__init__.py')
-rw-r--r-- | fail2ban/__init__.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fail2ban/__init__.py b/fail2ban/__init__.py index c448827b..3de9058c 100644 --- a/fail2ban/__init__.py +++ b/fail2ban/__init__.py @@ -19,7 +19,6 @@ # Author: Cyril Jaquier # -# $Revision$ __author__ = "Cyril Jaquier" __version__ = "$Revision$" |