summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* prepare for 7.3.2 releasev7.3.2Rainer Gerhards2012-10-301-1/+9
|
* Merge branch 'master-ratelimit'Rainer Gerhards2012-10-301-0/+6
|\
| * Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-241-0/+8
| |\ | | | | | | | | | | | | Conflicts: doc/v7compatibility.html
| * \ Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-231-4/+15
| |\ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-191-13/+38
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ Merge branch 'beta' into master-ratelimitRainer Gerhards2012-10-161-4/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | imtcp: support for Linux-Type ratelimiting addedRainer Gerhards2012-10-151-0/+1
| | | | | |
| * | | | | imudp: support for Linux-like ratelimiting addedRainer Gerhards2012-10-151-1/+3
| | | | | |
| * | | | | imptcp: support for Linux-Type ratelimiting addedRainer Gerhards2012-10-151-0/+1
| | | | | |
| * | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-151-1/+39
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html
| * | | | | | imudp: add input batching & ratelimiter interfaceRainer Gerhards2012-10-151-0/+3
| | | | | | |
* | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-301-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | | | | | bugfix: omfwd did not properly support "template" parameterRainer Gerhards2012-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also added a testbench test to check for this in the future. That in turn required new testbench tools.
| * | | | | | | prepare for 7.2.1 releasev7.2.1Rainer Gerhards2012-10-291-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'beta-jsonrt' into master-esRainer Gerhards2012-10-291-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | | | | | | | omelasticsearch: support for writing data errors to local file addedRainer Gerhards2012-07-301-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-291-0/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | bugfix: ruleset()-object did only support a single statementRainer Gerhards2012-10-271-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-271-0/+2
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | add -D rsyslogd option to enable config parser debug modeRainer Gerhards2012-10-271-0/+1
| | | | | | | |
| * | | | | | | Improve syntax error messages by outputting the error tokenRainer Gerhards2012-10-271-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-241-0/+8
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | make rsyslog core suspened actions after 10 failures in a rowRainer Gerhards2012-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was former the case after 1,000 failures and could cause rsyslog to be spammed/ressou
| * | | | | | ommongodb rate-limits error messages to prevent spamming the syslogRainer Gerhards2012-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366
* | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-231-4/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-10-221-2/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c
| | * | | | | | preparing for 6.6.0v6.6.0Rainer Gerhards2012-10-221-2/+5
| | | | | | | |
| | * | | | | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-0/+3
| | | | | | | |
| | * | | | | | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-191-0/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-171-3/+7
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-161-1/+9
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-111-0/+6
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | preparing for 6.5.1 releasev6.5.1Rainer Gerhards2012-10-111-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0Rainer Gerhards2012-10-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized.
* | | | | | | | | | | | | | bugfix: segfault on startup when modules using MSG_PASSING mode are usedRainer Gerhards2012-10-231-0/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'beta-newgrammar'Rainer Gerhards2012-10-221-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | | | | | | permit action-like statements (stop, call, ...) in action listsRainer Gerhards2012-10-221-0/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | prepare for 7.3.1 releasev7.3.1Rainer Gerhards2012-10-191-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-191-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | | | | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus some cleanup
| * | | | | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-191-0/+1
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-181-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | | | | preparing for 7.1.12 releasev7.1.12Rainer Gerhards2012-10-181-1/+3
| | | | | | | | | | | |
* | | | | | | | | | | | doc: add recent optimization to ChangeLogRainer Gerhards2012-10-181-0/+2
| | | | | | | | | | | |
* | | | | | | | | | | | doc: update ChangeLog infoRainer Gerhards2012-10-171-1/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-171-3/+6
|\| | | | | | | | | | |
| * | | | | | | | | | | doc: add (v5-imported) imklog bugfix to ChangeLogRainer Gerhards2012-10-171-0/+3
| | | | | | | | | | | |