summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | ratelimiter: enable thread-safe mode & (related) API changesRainer Gerhards2012-10-159-105/+101
| * | | | | | | | | | | Change debug output defaults to match current needsRainer Gerhards2012-10-151-2/+2
| * | | | | | | | | | | indicate no original code left in imudpRainer Gerhards2012-10-151-2/+0
| * | | | | | | | | | | interface cleanup (probably not final)Rainer Gerhards2012-10-1510-25/+24
| * | | | | | | | | | | milestone: ratelimiter used in imptcpRainer Gerhards2012-10-156-26/+111
| * | | | | | | | | | | milestone: experimental rate limiter used in imuxsockRainer Gerhards2012-10-125-1/+169
| * | | | | | | | | | | new ratelimit: interface plumbing addedRainer Gerhards2012-10-0914-20/+127
* | | | | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-3011-4/+155
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | 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
* | | | | | | | | | | move cJSON to omelasticsearchRainer Gerhards2012-10-2913-7/+5
* | | | | | | | | | | Merge branch 'beta-jsonrt' into master-esRainer Gerhards2012-10-2915-49/+1450
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | omelasticsearch: improved debug loggingRainer Gerhards2012-07-301-2/+5
| * | | | | | | | | | | omelasticsearch: support for writing data errors to local file addedRainer Gerhards2012-07-303-14/+113
| * | | | | | | | | | | omelasticsearch: mileston: bulk reply is parsedRainer Gerhards2012-07-301-2/+48
| * | | | | | | | | | | omelasticsearch: parse JSON response (in regard to data errors)Rainer Gerhards2012-07-253-38/+67
| * | | | | | | | | | | add cJSON to rsyslog runtimeRainer Gerhards2012-07-2510-2/+1225
* | | | | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-292-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | bugfix: ruleset()-object did only support a single statementRainer Gerhards2012-10-272-1/+2
* | | | | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-275-4/+18
|\| | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | 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
* | | | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-246-17/+38
|\| | | | | | | | | | | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | 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 'v7-stable'Rainer Gerhards2012-10-234-8/+17
|\| | | | | | | | |
| * | | | | | | | | 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
| * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | bugfix: segfault on startup when modules using MSG_PASSING mode are usedRainer Gerhards2012-10-232-1/+5
* | | | | | | | | | | | | | | | Merge branch 'beta-newgrammar'Rainer Gerhards2012-10-222-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | permit action-like statements (stop, call, ...) in action listsRainer Gerhards2012-10-222-3/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | re-enable deprecated warings for omdiscard/omrulesetRainer Gerhards2012-10-222-8/+0
* | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-224-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-222-0/+8
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | doc: remove BSD blocks from rsyslog.conf manpageRainer Gerhards2012-10-221-8/+1