Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | prepare for 7.3.2 releasev7.3.2 | Rainer Gerhards | 2012-10-30 | 1 | -1/+9 |
| | |||||
* | Merge branch 'master-ratelimit' | Rainer Gerhards | 2012-10-30 | 1 | -0/+6 |
|\ | |||||
| * | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-24 | 1 | -0/+8 |
| |\ | | | | | | | | | | | | | Conflicts: doc/v7compatibility.html | ||||
| * \ | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-23 | 1 | -4/+15 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * \ \ | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 1 | -13/+38 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * \ \ \ | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-16 | 1 | -4/+20 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | imtcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | imudp: support for Linux-like ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | imptcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 1 | -1/+39 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html | ||||
| * | | | | | | imudp: add input batching & ratelimiter interface | Rainer Gerhards | 2012-10-15 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-30 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| * | | | | | | | bugfix: omfwd did not properly support "template" parameter | Rainer Gerhards | 2012-10-30 | 1 | -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.1 | Rainer Gerhards | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'beta-jsonrt' into master-es | Rainer Gerhards | 2012-10-29 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | | | | | | | omelasticsearch: support for writing data errors to local file added | Rainer Gerhards | 2012-07-30 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-29 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | bugfix: ruleset()-object did only support a single statement | Rainer Gerhards | 2012-10-27 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-27 | 1 | -0/+2 |
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | add -D rsyslogd option to enable config parser debug mode | Rainer Gerhards | 2012-10-27 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Improve syntax error messages by outputting the error token | Rainer Gerhards | 2012-10-27 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-24 | 1 | -0/+8 |
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | make rsyslog core suspened actions after 10 failures in a row | Rainer Gerhards | 2012-10-24 | 1 | -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 syslog | Rainer Gerhards | 2012-10-24 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366 | ||||
* | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-23 | 1 | -4/+13 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-22 | 1 | -2/+8 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c | ||||
| | * | | | | | | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 1 | -2/+5 |
| | | | | | | | | |||||
| | * | | | | | | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -0/+3 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 1 | -3/+7 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 1 | -1/+9 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | preparing for 6.5.1 releasev6.5.1 | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 1 | -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 used | Rainer Gerhards | 2012-10-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'beta-newgrammar' | Rainer Gerhards | 2012-10-22 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | | | | | | | | permit action-like statements (stop, call, ...) in action lists | Rainer Gerhards | 2012-10-22 | 1 | -0/+1 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | prepare for 7.3.1 releasev7.3.1 | Rainer Gerhards | 2012-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 1 | -2/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | | | | | | | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus some cleanup | ||||
| * | | | | | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 1 | -0/+1 |
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-18 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | | | | | | | preparing for 7.1.12 releasev7.1.12 | Rainer Gerhards | 2012-10-18 | 1 | -1/+3 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | doc: add recent optimization to ChangeLog | Rainer Gerhards | 2012-10-18 | 1 | -0/+2 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | doc: update ChangeLog info | Rainer Gerhards | 2012-10-17 | 1 | -1/+5 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-17 | 1 | -3/+6 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | doc: add (v5-imported) imklog bugfix to ChangeLog | Rainer Gerhards | 2012-10-17 | 1 | -0/+3 |
| | | | | | | | | | | | |