Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | new ruleengine: implement template type "subtree" | Rainer Gerhards | 2012-09-18 | 1 | -5/+5 |
* | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-12 | 1 | -5/+5 |
|\ | |||||
| * | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-12 | 1 | -8/+6 |
| |\ | |||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-12 | 1 | -5/+5 |
| | |\ | |||||
| | | * | remove unused variables (if SCM_CREDENTIALS is not available) | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -1/+5 |
| | | * | imuxsock: remove incorrect socket option call | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -4/+0 |
* | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-09-11 | 1 | -3/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-11 | 1 | -3/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | fix compile problem on FreeBSD | Brad Davis | 2012-09-11 | 1 | -3/+1 |
| * | | | Remove a no-effect ", NULL"; | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
* | | | | Fix length problem with _CMDLINE | Milan Bartos | 2012-09-11 | 1 | -3/+3 |
* | | | | imuxsock: use CEE root for trusted properties | Rainer Gerhards | 2012-09-10 | 1 | -1/+4 |
* | | | | Don't store uninitialized data in trusted JSON properties | Miloslav Trmač | 2012-09-04 | 1 | -9/+12 |
* | | | | Don't overload length as error code indicator in getTrusted* | Miloslav Trmač | 2012-09-04 | 1 | -12/+6 |
* | | | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-29 | 3 | -43/+184 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | milestone: ommongodb supports templates & JSON passing API in place | Rainer Gerhards | 2012-08-29 | 1 | -15/+8 |
| * | | | adapted Mirek's changes to new JSON passing mode | Rainer Gerhards | 2012-08-29 | 2 | -47/+26 |
| * | | | Add template support: parse text, convert to BSON | Miloslav Trmač | 2012-08-29 | 2 | -8/+175 |
| * | | | Split MongoDB output into BSON creation and MongoDB interaction | Miloslav Trmač | 2012-08-29 | 1 | -24/+27 |
| * | | | bugfix: imtcp could abort on exit due to invalid free() | Rainer Gerhards | 2012-08-28 | 1 | -1/+0 |
* | | | | imuxsock: changed to use new JSON based system | Rainer Gerhards | 2012-08-27 | 1 | -48/+19 |
* | | | | minor cleanup | Rainer Gerhards | 2012-08-27 | 1 | -14/+0 |
* | | | | mmnormalize: switched to new JSON system | Rainer Gerhards | 2012-08-27 | 1 | -12/+24 |
* | | | | mmauditparse: change to support new json-based system | Rainer Gerhards | 2012-08-27 | 1 | -53/+22 |
* | | | | milestone: first PoC for hierarchical data inside msg | Rainer Gerhards | 2012-08-27 | 1 | -23/+54 |
|/ / / | |||||
* | | | 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 | 3 | -7/+7 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 3 | -7/+7 |
| |\| | |||||
| | * | changed TRUE/FALSE to RSTRUE/RSFALSE | Rainer Gerhards | 2012-08-22 | 3 | -7/+7 |
| | * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-15 | 1 | -13/+2 |
| | |\ | |||||
* | | | | Fix undefined ctxee problem | Milan Bartos | 2012-08-21 | 1 | -2/+4 |
* | | | | Add support for parsing trusted properties | Milan Bartos | 2012-08-21 | 1 | -30/+121 |
* | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Rainer Gerhards | 2012-08-02 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Merge branch 'beta' | Rainer Gerhards | 2012-08-01 | 1 | -1/+5 |
| |\| | | | |||||
| | * | | | fix problem with cutting first 16 characters from message with bAnnotate on m... | Milan Bartos | 2012-08-01 | 1 | -1/+5 |
* | | | | | Fix $SystemLogSocketAnnotate | Miloslav Trmač | 2012-07-31 | 1 | -3/+2 |
|/ / / / | |||||
* | | | | imzmq3: Added the return call to runInput | David Kelly | 2012-07-31 | 1 | -0/+1 |
* | | | | BAT-40 Found leak in imzmq3 plugin | David Kelly | 2012-07-31 | 1 | -1/+4 |
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-07-24 | 3 | -50/+196 |
|\| | | | |||||
| * | | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was used | Rainer Gerhards | 2012-07-24 | 1 | -1/+1 |
| * | | | omelasticsearch: regression from "parent" feature could case aborts | Rainer Gerhards | 2012-07-11 | 1 | -23/+26 |
| * | | | bugfix: imtcp aborted when more than 2 connections were used. | Andre Lorbach | 2012-07-11 | 2 | -2/+2 |
| * | | | omelasticsearch: support for parameters parent & dynparent added | Rainer Gerhards | 2012-07-10 | 1 | -20/+95 |
| * | | | omelasticsearch: implement retry via request to es server homepage | Rainer Gerhards | 2012-07-10 | 1 | -10/+60 |
| * | | | omelasticsearch: better debug instrumentation | Rainer Gerhards | 2012-07-09 | 1 | -15/+33 |
* | | | | bugfix: omhdfs did no longer compile | Rainer Gerhards | 2012-07-11 | 1 | -1/+1 |
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 1 | -48/+374 |
|\| | | | |||||
| * | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 1 | -48/+374 |
| |\ \ \ | |||||
| | * | | | omelasticsearch: bugfix: bulkmode setting was not properly initialized | Rainer Gerhards | 2012-06-13 | 1 | -0/+1 |