| Commit message (Expand) | Author | Age | Files | Lines |
* | Add missing prototype for tplToJSON() | Rainer Gerhards | 2012-09-10 | 1 | -0/+2 |
* | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-06 | 2 | -5/+7 |
|\ |
|
| * | preparing for 6.4.1 releasev6.4.1 | Rainer Gerhards | 2012-09-06 | 4 | -7/+9 |
* | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-06 | 9 | -11/+56 |
|\| |
|
| * | Fixed TCP CheckConnection handling in omfwd.c. | Andre Lorbach | 2012-08-25 | 7 | -9/+30 |
| * | bugfix: omusrsmsg incorrect return state & config warning handling | Rainer Gerhards | 2012-08-28 | 3 | -2/+26 |
* | | switch field default to "mandatory" and implement that mode | Rainer Gerhards | 2012-08-30 | 3 | -14/+19 |
* | | add capability to specify "optional" attribute for list-type templates, too | Rainer Gerhards | 2012-08-29 | 1 | -0/+5 |
* | | Add support for optional fields | Miloslav Trmač | 2012-08-29 | 3 | -0/+10 |
* | | default outname for $!<property> is now without $! prefix | Rainer Gerhards | 2012-08-29 | 4 | -31/+42 |
* | | milestone: ommongodb supports templates & JSON passing API in place | Rainer Gerhards | 2012-08-29 | 2 | -15/+10 |
* | | adapted Mirek's changes to new JSON passing mode | Rainer Gerhards | 2012-08-29 | 4 | -50/+27 |
* | | Add template support: parse text, convert to BSON | Miloslav Trmač | 2012-08-29 | 3 | -12/+178 |
* | | Split MongoDB output into BSON creation and MongoDB interaction | Miloslav Trmač | 2012-08-29 | 1 | -24/+27 |
* | | implement ACT_JSON_PASSING | Rainer Gerhards | 2012-08-29 | 2 | -12/+56 |
* | | Merge branch 'master-jsonc' into master-jsonpassing | Rainer Gerhards | 2012-08-29 | 1 | -2/+5 |
|\ \ |
|
| * | | add json-c to build system | Rainer Gerhards | 2012-08-26 | 1 | -2/+5 |
* | | | add OMSR_TPL_AS_JSON mode for output modules (interface only) | Rainer Gerhards | 2012-08-29 | 5 | -5/+19 |
* | | | bugfix: imtcp could abort on exit due to invalid free() | Rainer Gerhards | 2012-08-28 | 2 | -1/+3 |
* | | | preparing for 6.5.0 releasev6.5.0 | Rainer Gerhards | 2012-08-28 | 2 | -2/+3 |
* | | | doc: new template system, some more output modules | Rainer Gerhards | 2012-08-28 | 4 | -21/+434 |
* | | | Merge branch 'master-uuid' | Rainer Gerhards | 2012-08-27 | 6 | -4/+89 |
|\ \ \ |
|
| * | | | made new uuid property threadsafe | Rainer Gerhards | 2012-08-26 | 2 | -15/+25 |
| * | | | add uuid property to message object | Jérôme Renard | 2012-08-26 | 5 | -4/+79 |
* | | | | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-08-27 | 8 | -15/+695 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | add capability to configure outname for constant (inside template) | Rainer Gerhards | 2012-08-25 | 4 | -22/+15 |
| * | | | milestone: LIST-type templates support full option set | Rainer Gerhards | 2012-08-25 | 2 | -5/+77 |
| * | | | milestone: LIST-type template now only missing regex support | Rainer Gerhards | 2012-08-25 | 1 | -0/+41 |
| * | | | milestone: LIST-type templates work, but no all options yet present | Rainer Gerhards | 2012-08-25 | 4 | -13/+291 |
| * | | | milestone: base plumbing for LIST-type templates mostly in place | Rainer Gerhards | 2012-08-25 | 5 | -18/+106 |
| * | | | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-08-25 | 23 | -109/+238 |
| |\ \ \ |
|
| * | | | | v6 config/templates: legacy types are now supported via template() | Rainer Gerhards | 2012-08-25 | 3 | -3/+180 |
| * | | | | add base plumbing for template() config object to grammar | Rainer Gerhards | 2012-08-24 | 4 | -2/+33 |
* | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-26 | 2 | -1/+13 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | doc: add incompatible patch info to ChangeLog | Rainer Gerhards | 2012-08-26 | 1 | -0/+12 |
| * | | | | INCOMPATIBLE: Return {} for missing $!all-json | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
| * | | | | INCOMPATIBLE: use :, not =, as separator for jsonf | Miloslav Trmač | 2012-08-26 | 2 | -2/+2 |
| * | | | | Remove a no-effect ", NULL"; | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
| * | | | | Fix printing of some template options | Miloslav Trmač | 2012-08-26 | 1 | -1/+4 |
| * | | | | cleanup: remove left-over commented-out code | Rainer Gerhards | 2012-08-25 | 1 | -10/+0 |
* | | | | | INCOMPATIBLE: use :, not =, as separator for jsonf | Miloslav Trmač | 2012-08-26 | 2 | -2/+2 |
| |_|_|/
|/| | | |
|
* | | | | Remove a no-effect ", NULL"; | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
* | | | | Silence compiler warnings about unused parameters. | Miloslav Trmač | 2012-08-26 | 1 | -0/+3 |
| |_|/
|/| | |
|
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 23 | -110/+239 |
|\| |
| |/
|/| |
|
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 21 | -105/+193 |
| |\ |
|
| | * | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2012-08-25 | 3 | -30/+48 |
| | |\ |
|
| | | * | change template.[ch] to ASL 2.0, removing a GPLv3-only patch | Rainer Gerhards | 2012-08-25 | 3 | -30/+48 |
| | * | | preparing for 5.10.0 releasev5.10.0 | Rainer Gerhards | 2012-08-22 | 4 | -4/+11 |
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 1 | -2/+6 |
| | |\| |
|
| | | * | preparing for 5.8.13 releasev5.8.13 | Rainer Gerhards | 2012-08-22 | 3 | -3/+3 |