summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-newtemplate'Rainer Gerhards2012-08-278-15/+695
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | add capability to configure outname for constant (inside template)Rainer Gerhards2012-08-254-22/+15
| | * | | | | | | | | | | | | | | | | | | | | | | milestone: LIST-type templates support full option setRainer Gerhards2012-08-252-5/+77
| | * | | | | | | | | | | | | | | | | | | | | | | milestone: LIST-type template now only missing regex supportRainer Gerhards2012-08-251-0/+41
| | * | | | | | | | | | | | | | | | | | | | | | | milestone: LIST-type templates work, but no all options yet presentRainer Gerhards2012-08-254-13/+291
| | * | | | | | | | | | | | | | | | | | | | | | | milestone: base plumbing for LIST-type templates mostly in placeRainer Gerhards2012-08-255-18/+106
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into master-newtemplateRainer Gerhards2012-08-2523-109/+238
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | v6 config/templates: legacy types are now supported via template()Rainer Gerhards2012-08-253-3/+180
| | * | | | | | | | | | | | | | | | | | | | | | | | add base plumbing for template() config object to grammarRainer Gerhards2012-08-244-2/+33
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-08-262-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | INCOMPATIBLE: use :, not =, as separator for jsonfMiloslav Trmač2012-08-262-2/+2
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Remove a no-effect ", NULL";Miloslav Trmač2012-08-261-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | Silence compiler warnings about unused parameters.Miloslav Trmač2012-08-261-0/+3
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-08-2523-110/+239
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Fix printing of some template optionsMiloslav Trmač2012-08-211-1/+4
| * | | | | | | | | | | | | | | | | | | | | | | | doc: add imported patch to ChangeLogRainer Gerhards2012-08-211-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | Fix undefined ctxee problemMilan Bartos2012-08-211-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | | update documentation for parsing trusted propertiesMilan Bartos2012-08-211-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | Add support for parsing trusted propertiesMilan Bartos2012-08-211-30/+121
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-08-022-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2012-08-012-1/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | doc: added last patch to ChangeLogRainer Gerhards2012-07-311-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix $SystemLogSocketAnnotateMiloslav Trmač2012-07-311-3/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | imzmq3: Added the return call to runInputDavid Kelly2012-07-311-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | BAT-40 Found leak in imzmq3 pluginDavid Kelly2012-07-311-1/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | doc: improved doc for built-in modulesFlorian Riedl2012-07-247-24/+443
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-07-2410-60/+257
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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