summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |\ \
| * | | | nitfix: status indication (now: stable) was invalid in ChangeLogv6.4.0Rainer Gerhards2012-08-201-1/+1
| | | | |
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2012-08-201-0/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | undo last queue patch - caused a regressionRainer Gerhards2012-08-011-4/+0
| | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided
| | * | | bugfix: potential abort if output plugin logged message during shutdownRainer Gerhards2012-08-011-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347
| | * | | bugfix: DA queue fixed handling of bad queue files.Andre Lorbach2012-07-311-0/+4
| | | | |
| * | | | preparing for 6.4.0 releaseRainer Gerhards2012-08-201-1/+4
| | | | |
* | | | | doc: add imported patch to ChangeLogRainer Gerhards2012-08-211-0/+2
| | | | |
* | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-08-021-0/+3
|\ \ \ \ \
| * | | | | Merge branch 'beta'Rainer Gerhards2012-08-011-0/+3
| |\| | | |
| | * | | | doc: add last patch to ChangelogRainer Gerhards2012-08-011-0/+3
| | | | | |
* | | | | | doc: added last patch to ChangeLogRainer Gerhards2012-07-311-0/+2
|/ / / / /
* | | | | Merge branch 'beta'Rainer Gerhards2012-07-241-3/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was usedRainer Gerhards2012-07-241-0/+1
| | | | |
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2012-07-241-0/+1
| |\| | |
| * | | | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342
| * | | | omelasticsearch: support for parameters parent & dynparent addedRainer Gerhards2012-07-101-0/+3
| | | | |
| * | | | preparing for 6.3.12v6.3.12Rainer Gerhards2012-07-021-3/+1
| | | | |
* | | | | Merge branch 'v5-stable'Rainer Gerhards2012-07-241-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | bugfix: DA queue could cause abortRainer Gerhards2012-07-241-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | ...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked.
* | | | bugfix: omhdfs did no longer compileRainer Gerhards2012-07-111-0/+1
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-06-291-0/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | | cosmetic: added info about omelasticsearch to ChangeLogRainer Gerhards2012-06-291-0/+7
| | | |