summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-062-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-069-11/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | switch field default to "mandatory" and implement that modeRainer Gerhards2012-08-303-14/+19
| * | | | | | | | | | | | | | | | | | | | | | add capability to specify "optional" attribute for list-type templates, tooRainer Gerhards2012-08-291-0/+5
| * | | | | | | | | | | | | | | | | | | | | | Add support for optional fieldsMiloslav Trmač2012-08-293-0/+10
| * | | | | | | | | | | | | | | | | | | | | | default outname for $!<property> is now without $! prefixRainer Gerhards2012-08-294-31/+42
| * | | | | | | | | | | | | | | | | | | | | | milestone: ommongodb supports templates & JSON passing API in placeRainer Gerhards2012-08-292-15/+10
| * | | | | | | | | | | | | | | | | | | | | | adapted Mirek's changes to new JSON passing modeRainer Gerhards2012-08-294-50/+27
| * | | | | | | | | | | | | | | | | | | | | | Add template support: parse text, convert to BSONMiloslav Trmač2012-08-293-12/+178
| * | | | | | | | | | | | | | | | | | | | | | Split MongoDB output into BSON creation and MongoDB interactionMiloslav Trmač2012-08-291-24/+27
| * | | | | | | | | | | | | | | | | | | | | | implement ACT_JSON_PASSINGRainer Gerhards2012-08-292-12/+56
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-jsonc' into master-jsonpassingRainer Gerhards2012-08-291-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | add json-c to build systemRainer Gerhards2012-08-261-2/+5
| * | | | | | | | | | | | | | | | | | | | | | | add OMSR_TPL_AS_JSON mode for output modules (interface only)Rainer Gerhards2012-08-295-5/+19
| * | | | | | | | | | | | | | | | | | | | | | | bugfix: imtcp could abort on exit due to invalid free()Rainer Gerhards2012-08-282-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | preparing for 6.5.0 releasev6.5.0Rainer Gerhards2012-08-282-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | doc: new template system, some more output modulesRainer Gerhards2012-08-284-21/+434
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-uuid'Rainer Gerhards2012-08-276-4/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | made new uuid property threadsafeRainer Gerhards2012-08-262-15/+25
| | * | | | | | | | | | | | | | | | | | | | | | | add uuid property to message objectJérôme Renard2012-08-265-4/+79
| * | | | | | | | | | | | | | | | | | | | | | | | 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