summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-131-0/+4
| | |\|
| | | * add "EAGAIN" patch to ChangeLogRainer Gerhards2012-11-131-0/+4
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-091-0/+21
|\| | |
| * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-091-0/+10
| |\| |
| | * | bugfix: $IncludeConfig did not correctly process directoriesRainer Gerhards2012-11-091-0/+5
| * | | cleanupRainer Gerhards2012-11-091-7/+7
| * | | Merge branch 'v7.2.1-bugfix' into v7-stableRainer Gerhards2012-11-091-0/+7
| |\ \ \
| | * | | bugfix: potential segfault due to invalid param handling in comparisonsRainer Gerhards2012-11-081-0/+7
| * | | | enabled to build without libuuid, at loss of uuid functionalityRainer Gerhards2012-11-091-0/+4
* | | | | doc: mention imported patches in ChangeLogRainer Gerhards2012-11-081-0/+6
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-081-0/+5
|\| | | |
| * | | | doc: mention imported patch in ChangeLogRainer Gerhards2012-11-081-0/+1
| * | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-081-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | bugfix: no error msg on invalid field option in legacy/string templateRainer Gerhards2012-11-081-0/+1
| * | | | bugfixes in string-type template()SRainer Gerhards2012-11-081-0/+3
* | | | | prepare for 7.3.3 releasev7.3.3Rainer Gerhards2012-11-071-0/+3
* | | | | bugfix: dynafile zip files could be corruptedRainer Gerhards2012-11-051-0/+6
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-021-0/+4
|\| | | |
| * | | | bugfix: potential abort of imtcp on rsyslogd shutdownRainer Gerhards2012-11-021-0/+1
| * | | | bugfix: potential segfault when re_match() function was usedoxpa2012-11-021-0/+3
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-011-0/+3
|\| | | |
| * | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-011-0/+3
| |\| | |
| | * | | doc: add recent patch (API) to ChangeLogRainer Gerhards2012-11-011-0/+3
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-011-1/+10
|\| | | |
| * | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-011-0/+7
| |\| | |
| | * | | bugfix: misaddressing of $mmnormalizeuserawmsg parameterRainer Gerhards2012-11-011-0/+4
| | * | | bugfix: build problems on some platformsRainer Gerhards2012-10-261-0/+3
| * | | | bugfix: imzmq3 segfault with PULL subscriptionMartin Nilsson2012-10-301-1/+3
* | | | | mmnormalize: support for v6+ config interface addedRainer Gerhards2012-11-011-0/+3
* | | | | mmjsonparse: support for v6+ config interface addedRainer Gerhards2012-11-011-0/+1
* | | | | 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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-231-4/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-191-13/+38
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'beta' into master-ratelimitRainer Gerhards2012-10-161-4/+20
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | imudp: add input batching & ratelimiter interfaceRainer Gerhards2012-10-151-0/+3
* | | | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-301-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | bugfix: omfwd did not properly support "template" parameterRainer Gerhards2012-10-301-0/+3
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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