summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v7-stable'Rainer Gerhards2012-11-013-4/+15
|\
| * 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
* | | doc: add module doc for mmjsonparseRainer Gerhards2012-11-013-0/+48
* | | typo fixRainer Gerhards2012-11-011-1/+1
* | | mmnormalize: support for v6+ config interface addedRainer Gerhards2012-11-013-36/+169
* | | mmjsonparse: support for v6+ config interface addedRainer Gerhards2012-11-012-5/+47
* | | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-0110-10/+10
* | | prepare for 7.3.2 releasev7.3.2Rainer Gerhards2012-10-303-3/+11
* | | Merge branch 'master-ratelimit'Rainer Gerhards2012-10-3035-471/+720
|\ \ \
| * | | remove legacy API parseAndSubmitMessage() from imrelpRainer Gerhards2012-10-291-3/+21
| * | | nit: correct invalid error codeRainer Gerhards2012-10-241-1/+1
| * | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-247-19/+38
| |\ \ \
| * | | | rate-limit rsyslog internal messagesRainer Gerhards2012-10-231-2/+7
| * | | | imuxsock: use a default ratelimiter if none else appliesRainer Gerhards2012-10-231-1/+9
| * | | | Merge branch 'tmp-ratelimit' into master-ratelimitRainer Gerhards2012-10-235-13/+25
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-235-13/+25
| | |\ \ \ \
| * | | | | | nit: valgrind-testaid was accidentely enabled in testbenchRainer Gerhards2012-10-231-1/+1
| |/ / / / /
| * | | | | remove "last message repeated n times" from rsyslog output partRainer Gerhards2012-10-237-232/+26
| * | | | | Merge branch 'beta' into master-ratelimitRainer Gerhards2012-10-222-9/+2
| |\ \ \ \ \
| * | | | | | ratelimit: add default ratelimiterRainer Gerhards2012-10-191-4/+14
| * | | | | | cleanupRainer Gerhards2012-10-191-38/+0
| * | | | | | imklog, impstats: support for new rate-limiting API addedRainer Gerhards2012-10-192-6/+5
| * | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-1924-230/+282
| |\ \ \ \ \ \
| * | | | | | | cosmetic: get rid of compiler warning on currently unused debug codeRainer Gerhards2012-10-191-1/+1
| * | | | | | | omruleset: update to new message submit APIs/ratelimiterRainer Gerhards2012-10-181-1/+5
| * | | | | | | Merge branch 'beta' into master-ratelimitRainer Gerhards2012-10-162-11/+22
| |\ \ \ \ \ \ \
| * | | | | | | | imtcp: support for Linux-Type ratelimiting addedRainer Gerhards2012-10-155-6/+41
| * | | | | | | | fix: memory leak in linux-like ratelimiterRainer Gerhards2012-10-151-1/+3
| * | | | | | | | imdiag: add support for new (ratelimiting) msg submit interfaceRainer Gerhards2012-10-151-3/+7
| * | | | | | | | fix: we need to use loadConf to access global settingsRainer Gerhards2012-10-151-1/+1
| * | | | | | | | cosmetic: remove compiler warningRainer Gerhards2012-10-151-1/+1
| * | | | | | | | fix: linux-like ratelimiting did not emit "final" message...Rainer Gerhards2012-10-151-7/+17
| * | | | | | | | imudp: support for Linux-like ratelimiting addedRainer Gerhards2012-10-153-3/+24
| * | | | | | | | remove debug codeRainer Gerhards2012-10-151-3/+0
| * | | | | | | | imptcp: support for Linux-Type ratelimiting addedRainer Gerhards2012-10-155-15/+22
| * | | | | | | | ratelimit: added linux-like ratelimiter typeRainer Gerhards2012-10-159-110/+143
| * | | | | | | | ratelimit: respect $repeatedmsgreduction settingRainer Gerhards2012-10-152-26/+49
| * | | | | | | | milestone: convert imuxsock to ratelimitAddMsg() interfaceRainer Gerhards2012-10-152-33/+6
| * | | | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-1515-24/+117
| |\ \ \ \ \ \ \ \
| * | | | | | | | | imfile: converted to new ratelimit interfaceRainer Gerhards2012-10-151-15/+7
| * | | | | | | | | ratelimit: imtcp (and gssapi) converted to new interfaceRainer Gerhards2012-10-154-17/+10
| * | | | | | | | | imudp: add input batching & ratelimiter interfaceRainer Gerhards2012-10-155-6/+17
| * | | | | | | | | 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