summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable'Rainer Gerhards2012-07-243-9/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-beta'Rainer Gerhards2012-07-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: omhdfs did no longer compileRainer Gerhards2012-07-112-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-297-52/+387
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-module'Rainer Gerhards2012-06-2932-345/+1373
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | imklog: removal of no longer needed config directivesRainer Gerhards2012-06-292-37/+6
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'beta' into master-moduleRainer Gerhards2012-06-296-38/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imklog: support for module() global config parameters addedRainer Gerhards2012-06-292-58/+116
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | immark: support for module() global config parameters addedRainer Gerhards2012-06-272-4/+67
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imuxsock: support for module() global config parameters addedRainer Gerhards2012-06-271-47/+128
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $actionname was not properly set via legacy directiveRainer Gerhards2012-06-271-4/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide support to dynamically enable/disable legacy conf commandRainer Gerhards2012-06-265-24/+55
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imudp: support for module() global config parameters addedRainer Gerhards2012-06-262-64/+71
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | impstats: support for module() global config parameters addedRainer Gerhards2012-06-261-25/+103
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modules: call new-style entry point only when new-style stmt is usedRainer Gerhards2012-06-261-2/+4
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omudpspoof: support for module() global config parameters addedRainer Gerhards2012-06-251-6/+132
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omudpspoof: remove actually not existing compresion level paramRainer Gerhards2012-06-251-5/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omuxsock: support for module() global config parameters addedRainer Gerhards2012-06-251-4/+128
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: typo fixRainer Gerhards2012-06-251-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ompipe: fix copy&paste name errorsRainer Gerhards2012-06-251-3/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omfwd: support for module() global config parameters addedRainer Gerhards2012-06-251-8/+127
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ompipe: support for module() global config parameters addedRainer Gerhards2012-06-252-5/+107
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a bit more cleanupRainer Gerhards2012-06-251-5/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup & fix of mini-leakRainer Gerhards2012-06-252-5/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-2512-37/+90
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | milestone: module() config statement basically worksRainer Gerhards2012-06-218-41/+220
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | milestone: module() can load module in legacy modeRainer Gerhards2012-06-206-13/+65
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogAndre Lorbach2012-06-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'beta'Charlie Root2012-06-281-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'beta'Andre Lorbach2012-06-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-275-37/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-152-12/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: small static memory leak in expression based filtersRainer Gerhards2012-06-141-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-141-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2012-06-1414-1/+1554
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bump default omfile iobuffer size to 4kRainer Gerhards2012-06-141-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixing memory leaks in expression-based filtersRainer Gerhards2012-06-143-0/+77
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re_match() function now also executesRainer Gerhards2012-06-131-4/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | milestone: regex is compiled from script based filterRainer Gerhards2012-06-124-3/+63
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cosmetic: merge remains in ChangeLog cleared upRainer Gerhards2012-06-121-3/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-regexp'Rainer Gerhards2012-06-122-2/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first experiments with regexp'es in RainerScriptRainer Gerhards2012-05-292-2/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-beta'Rainer Gerhards2012-06-111-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2012-06-112-4/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2012-06-112-2/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2012-06-0610-53/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cosmetic: updated ChangeLog to mention new 0mq pluginsRainer Gerhards2012-06-041-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-044-16/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-zmq'Rainer Gerhards2012-06-0111-5/+1251
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor updatesDavid Kelly2012-06-014-75/+128