summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add missing prototype for tplToJSON()Rainer Gerhards2012-09-101-0/+2
* Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-062-5/+7
|\
| * preparing for 6.4.1 releasev6.4.1Rainer Gerhards2012-09-064-7/+9
* | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-069-11/+56
|\|
| * Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-257-9/+30
| * bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-283-2/+26
* | 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
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | doc: add incompatible patch info to ChangeLogRainer Gerhards2012-08-261-0/+12
| * | | | INCOMPATIBLE: Return {} for missing $!all-jsonMiloslav Trmač2012-08-261-1/+1
| * | | | 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
| * | | | Fix printing of some template optionsMiloslav Trmač2012-08-261-1/+4
| * | | | cleanup: remove left-over commented-out codeRainer Gerhards2012-08-251-10/+0
* | | | | 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
|\| | | |/ |/|
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-2521-105/+193
| |\
| | * Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2012-08-253-30/+48
| | |\
| | | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-253-30/+48
| | * | preparing for 5.10.0 releasev5.10.0Rainer Gerhards2012-08-224-4/+11
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-2/+6
| | |\|
| | | * preparing for 5.8.13 releasev5.8.13Rainer Gerhards2012-08-223-3/+3