summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into master-ruleengRainer Gerhards2013-11-079-27/+43
|\
| * doc: maintain ChangeLogRainer Gerhards2013-11-071-6/+12
| * bugfix: regular workers are no longer started if DA worker is activePavel Levshin2013-11-071-8/+7
| * cleanup no longer needed codeRainer Gerhards2013-11-074-8/+1
| * Merge branch 'master' into master-newwtipoolRainer Gerhards2013-11-073-2/+5
| |\
| | * Merge branch 'v7-stable'Rainer Gerhards2013-11-070-0/+0
| | |\
| | | * do not adjust batch size for disk queuesRainer Gerhards2013-11-071-1/+1
| | | * do not complain for queue size on DA queuesRainer Gerhards2013-11-071-1/+2
| | * | cosmetic: add test headers to some testsRainer Gerhards2013-11-072-0/+2
| | * | do not adjust batch size for disk queuesRainer Gerhards2013-11-071-1/+1
| | * | do not complain for queue size on DA queuesRainer Gerhards2013-11-061-1/+2
| * | | doc: mention Pavel's improvement in ChangeLogRainer Gerhards2013-11-061-0/+6
| * | | improve worker thread pool handlingPavel Levshin2013-11-064-6/+15
| |/ /
* | | Merge branch 'master' into master-ruleengRainer Gerhards2013-11-063-17/+16
|\| |
| * | cleanup unreachable codeRainer Gerhards2013-11-061-7/+1
| * | omudpspoof: cleanup code that could never executeRainer Gerhards2013-11-061-5/+1
| * | Merge branch 'v7-stable'Rainer Gerhards2013-11-061-5/+14
| |\|
| | * doc: describe failover action precisenessRainer Gerhards2013-11-061-5/+14
* | | Merge branch 'master' into master-ruleengRainer Gerhards2013-11-053-7/+23
|\| |
| * | Merge branch 'v7-stable'Rainer Gerhards2013-11-052-6/+15
| |\|
| | * improved checking of queue config parameters on startupRainer Gerhards2013-11-052-6/+8
| | * emit warning message if queue.size is set dangerously lowRainer Gerhards2013-11-051-0/+7
| * | doc: amend queue parameter doc with live web linkRainer Gerhards2013-11-051-1/+4
| * | doc: clarify lower limit of queue.size parameterRainer Gerhards2013-11-051-1/+5
* | | Merge branch 'master' into master-ruleengRainer Gerhards2013-11-055-4/+47
|\| |
| * | Merge branch 'v7-stable'Rainer Gerhards2013-11-055-4/+47
| |\|
| | * Merge branch 'v7-stable-call-ruleset-queue' into v7-stableRainer Gerhards2013-11-055-4/+47
| | |\
| | | * bugfix: call to ruleset with async queue did not use the queueRainer Gerhards2013-06-265-4/+46
* | | | fix tryResume callbackRainer Gerhards2013-11-042-5/+8
* | | | omtesting: support v8 omod interfaceRainer Gerhards2013-11-011-1/+12
* | | | doc: omstdout now works under v8Rainer Gerhards2013-11-011-1/+1
* | | | doc: omruleset now supported on v8Rainer Gerhards2013-11-011-1/+1
* | | | omjournal: support v8 omod interfaceRainer Gerhards2013-11-012-1/+16
* | | | omstdout: support v8 omod interfaceRainer Gerhards2013-11-011-3/+18
* | | | Merge branch 'master' into master-ruleengRainer Gerhards2013-10-311-0/+1
|\| | |
| * | | ommysql cosmetic: change some historic namesRainer Gerhards2013-10-311-21/+21
| * | | doc: add missing ChangeLog entryRainer Gerhards2013-10-311-0/+1
* | | | ommysql cosmetic: change some historic namesRainer Gerhards2013-10-311-36/+36
* | | | omruleset: make work with v8 omod interfaceRainer Gerhards2013-10-311-3/+14
* | | | module omruleset is no longer enabled by default.Rainer Gerhards2013-10-312-1/+7
* | | | remove pData emulation from v8 omod interfaceRainer Gerhards2013-10-317-6/+13
* | | | ommysql: add support for v8 output module interfaceRainer Gerhards2013-10-312-54/+62
* | | | Merge branch 'master' into master-ruleengRainer Gerhards2013-10-312-8/+5
|\| | |
| * | | bugfix: ommysql lost configfile/section parameters after first closeRainer Gerhards2013-10-312-8/+5
* | | | omshell: make play well with v8 output module interfaceRainer Gerhards2013-10-311-5/+2
* | | | ompipe: make play well with v8 output module interfaceRainer Gerhards2013-10-311-0/+6
* | | | Merge branch 'master' into master-ruleengRainer Gerhards2013-10-311-1/+2
|\| | |
| * | | doc: update ChangeLogRainer Gerhards2013-10-311-0/+1
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-10-291-1/+1
| |\| |
| | * | prepare for 7.4.6 releasev7.4.6Rainer Gerhards2013-10-293-3/+3