summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * doc: update ChangeLog with CEE cookie changeRainer Gerhards2012-10-111-0/+8
| * Merge branch 'beta'Rainer Gerhards2012-10-113-3/+26
| |\
| | * Merge branch 'v6-stable' into betaRainer Gerhards2012-10-111-0/+12
| | |\
| | | * change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-112-1/+7
| | * | Don't require the trailing space in @cee: cookieMiloslav Trmač2012-10-111-1/+1
| | * | doc: add last patch to ChangeLogRainer Gerhards2012-10-111-0/+2
| | * | Fix crash when date properties are used without a templateMiloslav Trmač2012-10-111-2/+11
| * | | Merge branch 'beta'Rainer Gerhards2012-10-119-8/+49
| |\| |
| | * | add deprecated note to discard actionRainer Gerhards2012-10-113-1/+25
| | * | added deprecated note to omrulesetRainer Gerhards2012-10-113-0/+10
| | * | make omruleset non-default in ./configureRainer Gerhards2012-10-111-1/+1
| | * | preparing for 7.1.10 releasev7.1.10Rainer Gerhards2012-10-112-2/+2
| | * | fix regression introduced by last commitRainer Gerhards2012-10-111-1/+1
| | * | bugfixes in regards to action()Rainer Gerhards2012-10-112-0/+4
| | * | bugfix: some config processing warning messages were treated as errorsRainer Gerhards2012-10-112-2/+7
| | * | cosmetic: simplifyRainer Gerhards2012-10-111-3/+1
| | * | fix double-freeRainer Gerhards2012-10-111-1/+1
| * | | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+1
| |\| |
| | * | add missing prototypeRainer Gerhards2012-10-111-0/+1
| | * | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| * | | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+5
| |\| |
| | * | mention recent changes in ChangeLogRainer Gerhards2012-10-111-1/+6
| | * | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | * | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| * | | Merge branch 'v6-devel'Rainer Gerhards2012-10-113-7/+5
| |\ \ \
| | * | | 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
| | |\ \ \
| * | \ \ \ Merge branch 'beta'Rainer Gerhards2012-10-103-5/+24
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | cosmetic cleanupRainer Gerhards2012-10-091-3/+1
| | * | | | prepare for 7.1.9 releasev7.1.9Rainer Gerhards2012-10-093-4/+4
| | * | | | bugfix: in (non)equal comparisons the position of arrays influenced resultRainer Gerhards2012-10-092-1/+22
* | | | | | 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
* | | | | | milestone: experimental rate limiter used in imuxsockRainer Gerhards2012-10-125-1/+169
* | | | | | new ratelimit: interface plumbing addedRainer Gerhards2012-10-0914-20/+127
|/ / / / /
* | | | | preparing for 7.3.0 releasev7.3.0Rainer Gerhards2012-10-083-3/+3
* | | | | fix compile problem with DEBUG instrumentation enabledRainer Gerhards2012-10-081-1/+0