github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into 0.9 -- with that also progress into 0.9.0a1 

* master:
  Getting ready for further development

Conflicts:
	ChangeLog
	fail2ban/version.py
pull/224/merge 0.9.0a1
Yaroslav Halchenko 2013-05-13 12:58:53 -04:00
parent f5a8a8ac7c 725d666ee6
commit c21b7c3b9e
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -4,7 +4,7 @@
|_| \__,_|_|_/___|_.__/\__,_|_||_| |_| \__,_|_|_/___|_.__/\__,_|_||_|
================================================================================ ================================================================================
Fail2Ban (version 0.9.0a) 20??/??/?? Fail2Ban (version 0.9.0a1) 20??/??/??
================================================================================ ================================================================================
@ -41,6 +41,13 @@ code-review and minor additions from Yaroslav Halchenko.
* [..e019ab7] Multiple instances of the same action are allowed in the * [..e019ab7] Multiple instances of the same action are allowed in the
same jail -- use actname option to disambiguate. same jail -- use actname option to disambiguate.
ver. 0.8.10 (2013/XX/XXX) - NOT-YET-RELEASED
-----------
- Fixes
- New Features
- Enhancements
ver. 0.8.9 (2013/05/13) - wanna-be-stable ver. 0.8.9 (2013/05/13) - wanna-be-stable
---------- ----------

4
DEVELOP
View File

@ -338,8 +338,10 @@ Post Release
Add the following to the top of the ChangeLog Add the following to the top of the ChangeLog
ver. 0.8.9 (2013/XX/XXX) - wanna-be-stable ver. 0.8.11 (2013/XX/XXX) - wanna-be-stable
- Fixes - Fixes
- New Features - New Features
- Enhancements - Enhancements
and adjust common/version.py to carry .dev suffix to signal
a version under development.

2
fail2ban/version.py
View File

@ -24,4 +24,4 @@ __author__ = "Cyril Jaquier, Yaroslav Halchenko"
__copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2011-2013 Yaroslav Halchenko" __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2011-2013 Yaroslav Halchenko"
__license__ = "GPL" __license__ = "GPL"
version = "0.9.0a0" version = "0.9.0a1"