summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-0/+1
|\
| * bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-041-0/+1
| |
* | integrate logctl into build processRainer Gerhards2012-10-021-0/+1
| |
* | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-021-0/+2
|\|
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-021-0/+2
| |\
| | * bugfix: fixed wrong bufferlength for snprintf in tcpflood.cAndre Lorbach2012-09-281-0/+2
| | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail.
* | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-0/+2
| | | | | | | | | | | | This could lead to startup with invalid parameters.
* | | imfile: implement support for module parameters via module() stmtRainer Gerhards2012-09-271-0/+3
| | |
* | | Merge branch 'v6-stable' into v6-devel-inputRainer Gerhards2012-09-261-0/+2
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-261-0/+2
| |\| | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-261-0/+2
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-211-0/+4
|\| |
| * | bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-211-0/+4
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358 This happend to filters of the style "local0,local1.*", where the multiple facilities were comma-separated.
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-0/+5
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | doc: add last bugfix to ChangeLogRainer Gerhards2012-09-201-0/+5
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+2
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | preparing for 6.4.2 releasev6.4.2Rainer Gerhards2012-09-201-1/+1
| | |
| * | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-201-0/+1
| | |
* | | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-201-0/+1
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-191-0/+2
|\| |
| * | bugfix: potential abort, if action queue could not be properly startedRainer Gerhards2012-09-191-0/+2
| | | | | | | | | | | | This most importantly could happen due to configuration errors.
* | | bugfix: small memory leaks in template() statementsRainer Gerhards2012-09-171-0/+3
| | | | | | | | | | | | | | | these were one-time memory leaks during startup, so they did NOT grow during runtime
* | | fix ChangeLogRainer Gerhards2012-09-131-3/+15
| | | | | | | | | | | | got messed-up during merge :-(
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-131-0/+15
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-131-0/+4
| |\| | | | | | | | | | | | | Conflicts: runtime/rule.c
| | * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-131-0/+4
| | | | | | | | | | | | | | | | | | ...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report
| * | bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-131-0/+5
| | | | | | | | | | | | | | | | | | | | | Only \' was supported. Now the usual set is supported. Note that v5 used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later.
| * | nit: correct messed-up ChangeLogRainer Gerhards2012-09-121-3/+5
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-121-0/+4
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-121-0/+6
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-121-0/+4
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-061-2/+3
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | preparing for 6.4.1 releasev6.4.1Rainer Gerhards2012-09-061-2/+3
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-061-0/+12
|\| |
| * | Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-251-0/+3
| | | | | | | | | | | | Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly.
| * | bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug.
* | | milestone: ommongodb supports templates & JSON passing API in placeRainer Gerhards2012-08-291-0/+2
| | |
* | | bugfix: imtcp could abort on exit due to invalid free()Rainer Gerhards2012-08-281-0/+3
| | |
* | | preparing for 6.5.0 releasev6.5.0Rainer Gerhards2012-08-281-1/+2
| | |
* | | made new uuid property threadsafeRainer Gerhards2012-08-261-0/+4
| | |
* | | Merge branch 'v6-stable'Rainer Gerhards2012-08-261-0/+12
|\| |
| * | doc: add incompatible patch info to ChangeLogRainer Gerhards2012-08-261-0/+12
| | |
* | | Merge branch 'v6-stable'Rainer Gerhards2012-08-251-3/+30
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-251-2/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
| | * preparing for 5.10.0 releasev5.10.0Rainer Gerhards2012-08-221-1/+6
| | |
| | * Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-2/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * preparing for 5.8.13 releasev5.8.13Rainer Gerhards2012-08-221-1/+1
| | | |
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-0/+10
| | |\| | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c
| | | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog.
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-151-0/+5
| | |\ \