Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 release | 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 release | Rainer Gerhards | 2012-08-22 | 3 | -3/+3 |
| | | * | nit: forward-compatible default ruleset name as used in next version | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | * | | small bugfix: stream timeout API use was incorrect | Rainer Gerhards | 2012-08-22 | 1 | -2/+2 |
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 6 | -18/+119 |
| | |\| | |||||
| | | * | bugfix: multiple main queues with same queue file name were not detected | Rainer Gerhards | 2012-08-22 | 3 | -3/+48 |
| | * | | changed TRUE/FALSE to RSTRUE/RSFALSE | Rainer Gerhards | 2012-08-22 | 14 | -46/+45 |
| * | | | Merge branch 'beta' into v6-stable | Rainer Gerhards | 2012-08-20 | 211 | -11720/+15449 |
| |\ \ \ | |||||
| | * | | | nitfix: status indication (now: stable) was invalid in ChangeLog | Rainer Gerhards | 2012-08-20 | 1 | -1/+1 |
| | * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 3 | -3/+61 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | nitfix: remove quirck in new debug message code | Rainer Gerhards | 2012-08-01 | 1 | -4/+2 |
| | | * | | more elaborate debug logging for object deserializer | Rainer Gerhards | 2012-08-01 | 1 | -0/+39 |
| | | * | | undo last queue patch - caused a regression | Rainer Gerhards | 2012-08-01 | 2 | -5/+1 |
| | | * | | bugfix: potential abort if output plugin logged message during shutdown | Rainer Gerhards | 2012-08-01 | 2 | -7/+28 |
| | | * | | bugfix: DA queue fixed handling of bad queue files. | Andre Lorbach | 2012-07-31 | 2 | -1/+5 |
| | * | | | preparing for 6.4.0 release | Rainer Gerhards | 2012-08-20 | 3 | -3/+6 |
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-07-24 | 3 | -9/+10 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
* | | | | | Fix printing of some template options | Miloslav Trmač | 2012-08-21 | 1 | -1/+4 |
* | | | | | doc: add imported patch to ChangeLog | Rainer Gerhards | 2012-08-21 | 1 | -0/+2 |
* | | | | | Fix undefined ctxee problem | Milan Bartos | 2012-08-21 | 1 | -2/+4 |
* | | | | | update documentation for parsing trusted properties | Milan Bartos | 2012-08-21 | 1 | -0/+2 |
* | | | | | 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 | 2 | -1/+8 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'beta' | Rainer Gerhards | 2012-08-01 | 2 | -1/+8 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | doc: add last patch to Changelog | Rainer Gerhards | 2012-08-01 | 1 | -0/+3 |
| | * | | | | fix problem with cutting first 16 characters from message with bAnnotate on m... | Milan Bartos | 2012-08-01 | 1 | -1/+5 |
* | | | | | | doc: added last patch to ChangeLog | Rainer Gerhards | 2012-07-31 | 1 | -0/+2 |
* | | | | | | 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 |
* | | | | | doc: improved doc for built-in modules | Florian Riedl | 2012-07-24 | 7 | -24/+443 |
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-07-24 | 10 | -60/+257 |
|\| | | | | |||||
| * | | | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was used | Rainer Gerhards | 2012-07-24 | 2 | -1/+2 |
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-07-24 | 3 | -9/+10 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | 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 | 4 | -3/+6 |
| * | | | | omelasticsearch: support for parameters parent & dynparent added | Rainer Gerhards | 2012-07-10 | 2 | -20/+98 |
| * | | | | 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 | 2 | -17/+33 |
| * | | | | debug log: cleaned up & streamlined queue param output | Rainer Gerhards | 2012-07-05 | 1 | -20/+43 |
| * | | | | debug log: emit (some) action queue parameters to debug log | Rainer Gerhards | 2012-07-05 | 3 | -3/+28 |
| * | | | | preparing for 6.3.12v6.3.12 | Rainer Gerhards | 2012-07-02 | 3 | -5/+3 |
* | | | | | Merge branch 'v5-stable' | Rainer Gerhards | 2012-07-24 | 3 | -9/+10 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | bugfix: strm class could abort under some circumstances | Rainer Gerhards | 2012-07-24 | 1 | -6/+4 |