summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | actually a bit more than cosmetic - makes it easier to see what failed
| * | 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
|/ / | | | | | | | | among others, make possible that workers really timeout and the pool thus shrinks
* | 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 '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 'v7-stable'Rainer Gerhards2013-11-055-4/+47
|\|
| * Merge branch 'v7-stable-call-ruleset-queue' into v7-stableRainer Gerhards2013-11-055-4/+47
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * bugfix: call to ruleset with async queue did not use the queueRainer Gerhards2013-06-265-4/+46
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=443
* | | ommysql cosmetic: change some historic namesRainer Gerhards2013-10-311-21/+21
| | |
* | | doc: add missing ChangeLog entryRainer Gerhards2013-10-311-0/+1
| | |
* | | bugfix: ommysql lost configfile/section parameters after first closeRainer Gerhards2013-10-312-8/+5
| | | | | | | | | | | | | | | This means that when a connection was broken, it was probably re-instantiated with different parameters than configured.
* | | doc: update ChangeLogRainer Gerhards2013-10-311-0/+1
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-10-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | prepare for 7.4.6 releasev7.4.6Rainer Gerhards2013-10-293-3/+3
| | |
* | | build system: add missing doc filest to tarballRainer Gerhards2013-10-301-0/+7
| | | | | | | | | | | | Thanks to Pavel Levshin for alerting us on the missing files.
* | | build: add mmsequence to doc set in tarballRainer Gerhards2013-10-301-0/+1
| | |
* | | doc: mmsequence was missing in ChangeLogv7.5.6Rainer Gerhards2013-10-291-0/+2
| | |
* | | prepare for 7.5.6 releaseRainer Gerhards2013-10-163-3/+3
| | |
* | | add debug output for global vars (unsupported!) during property filter ↵Rainer Gerhards2013-10-161-3/+3
| | | | | | | | | | | | evaluation
* | | refactor regression fix: misadressing in property name debug outputRainer Gerhards2013-10-161-1/+3
| | |
* | | doc: mention new features in ChangeLogRainer Gerhards2013-10-161-2/+7
| | |
* | | Merge branch 'master' into tmpRainer Gerhards2013-10-162-3/+14
|\ \ \
| * | | undo "localhostname property handling simplification", which broke thingsRainer Gerhards2013-10-162-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | in v7.5, this is not a simplification but actually complicates things. While we could fix the effects by patching other places, the end result would be anything else but simpler. So we undid that change.
* | | | add module mmsequencePavel Levshin2013-10-166-2/+574
| | | |
* | | | Merge branch 'master-var-refactor' into tmpRainer Gerhards2013-10-1616-578/+357
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into master-var-refactorRainer Gerhards2013-10-262-1/+3
| |\ \ \
| * \ \ \ Merge branch 'master' into master-var-refactorRainer Gerhards2013-10-267-2/+45
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into master-var-refactorRainer Gerhards2013-10-262-0/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v7-stable-varfree' into master-var-refactorRainer Gerhards2013-10-253-28/+52
| |\ \ \ \ \ \
| | * | | | | | refactor var desctruction in script engineRainer Gerhards2013-10-251-25/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides better extensibility when new data types are added. Thanks to Pavel Levshin for suggesting this.
| * | | | | | | cleanup: remove no longer needed codeRainer Gerhards2013-10-241-86/+0
| | | | | | | |
| * | | | | | | refactor regression fix: misadressing during script variable evaluation in ↵Rainer Gerhards2013-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debug mode Thanks to Pavel Levshin for reporting the problem.
| * | | | | | | refactoring regression fix: segfault if $$now is used in scriptRainer Gerhards2013-10-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Pavel Levshin for finding this bug.
| * | | | | | | Merge branch 'master' into master-var-refactorRainer Gerhards2013-10-241-1/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into master-var-refactorRainer Gerhards2013-10-245-35/+29
| |\ \ \ \ \ \ \ \
| * | | | | | | | | (temporarily?) re-enable global vars in string templatesRainer Gerhards2013-10-231-0/+2
| | | | | | | | | |
| * | | | | | | | | refactoring regression fix: invalid free for JSON propertiesRainer Gerhards2013-10-231-1/+4
| | | | | | | | | |