summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bugfix: potential abort of imtcp on rsyslogd shutdownRainer Gerhards2012-11-022-3/+4
* bugfix: potential segfault when re_match() function was usedoxpa2012-11-022-1/+3
* Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-0111-10/+13
|\
| * doc: add recent patch (API) to ChangeLogRainer Gerhards2012-11-011-0/+3
| * bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-0110-10/+10
* | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-012-1/+8
|\|
| * bugfix: misaddressing of $mmnormalizeuserawmsg parameterRainer Gerhards2012-11-012-1/+5
| * bugfix: build problems on some platformsRainer Gerhards2012-10-262-1/+4
* | bugfix: imzmq3 segfault with PULL subscriptionMartin Nilsson2012-10-302-3/+7
* | bugfix: omfwd did not properly support "template" parameterRainer Gerhards2012-10-307-3/+110
* | testbench: complex1.sh testcase failed on slower machinesRainer Gerhards2012-10-292-0/+6
* | prepare for 7.2.1 releasev7.2.1Rainer Gerhards2012-10-293-3/+3
* | testbench: add test for ruleset() and call statementsRainer Gerhards2012-10-293-0/+38
* | bugfix: ruleset()-object did only support a single statementRainer Gerhards2012-10-272-1/+2
* | add -D rsyslogd option to enable config parser debug modeRainer Gerhards2012-10-273-1/+14
* | Improve syntax error messages by outputting the error tokenRainer Gerhards2012-10-272-1/+3
* | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-10-251-2/+1
|\|
| * doc: fix html formattingMichael Biebl2012-10-251-2/+1
* | cleanupRainer Gerhards2012-10-242-3/+1
* | make rsyslog core suspened actions after 10 failures in a rowRainer Gerhards2012-10-243-1/+15
* | ommongodb rate-limits error messages to prevent spamming the syslogRainer Gerhards2012-10-242-13/+22
* | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-10-222-5/+11
|\|
| * preparing for 6.6.0v6.6.0Rainer Gerhards2012-10-225-7/+10
| * Merge branch 'v6-beta' into v6-stableRainer Gerhards2012-10-2288-935/+7279
| |\
| | * Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-4/+4
| | |\
| | * | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-0/+3
| | * | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-5/+1
| | |\ \
| | * \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-176-45/+22
| | |\ \ \
| | * \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-162-9/+11
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-112-1/+7
| | |\ \ \ \ \
| | * | | | | | preparing for 6.5.1 releasev6.5.1Rainer Gerhards2012-10-113-3/+3
| | * | | | | | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | * | | | | | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | * | | | | | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | * | | | | | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| | * | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-045-29/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
| | |\ \ \ \ \ \ \
* | | | | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0Rainer Gerhards2012-10-225-5/+8
* | | | | | | | | | testbench: -c option no longer existsRainer Gerhards2012-10-221-2/+2
* | | | | | | | | | disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-222-0/+8
* | | | | | | | | | doc: remove BSD blocks from rsyslog.conf manpageRainer Gerhards2012-10-221-8/+1
* | | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-221-1/+1
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'v5-stable' into v6-stablev6.4.3.unfinishedRainer Gerhards2012-10-221-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | doc: v3 compatibility doc lists invalid config directiveRainer Gerhards2012-10-221-1/+1
* | | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-4/+4
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-192-4/+4
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-192-4/+4
* | | | | | | | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-2/+3
* | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-5/+1
|\| | | | | | | |
| * | | | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-192-5/+1
| | |_|_|_|_|_|/ | |/| | | | | |