summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cleanup no longer used variableRainer Gerhards2012-05-031-1/+0
* Merge branch 'v6-stable'Rainer Gerhards2012-05-035-18/+129
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-036-19/+120
| |\
| | * preparing for 5.8.11 releasev5.8.11Rainer Gerhards2012-05-033-3/+3
| | * ommysql: added support for new mysql_library_[init/exit]Rainer Gerhards2012-05-032-1/+27
| | * bugfix: ommysql did not properly init/exit the mysql runtime libraryRainer Gerhards2012-05-032-1/+14
| | * bugfix: rsyslog did not terminate when delayable inputs were blockedRainer Gerhards2012-05-032-5/+47
| | * bugfix: inside queue.c, some thread cancel states were not correctly reset.Rainer Gerhards2012-05-032-5/+8
| | * debug: slightly improved debug info for input module startupRainer Gerhards2012-05-031-0/+1
| | * bugfix: active input in "light delay state" could block rsyslog terminationRainer Gerhards2012-04-272-0/+6
| | * doc: correcting sample section of omudpspoofRainer Gerhards2012-04-201-8/+8
| | * doc: omudpspoof doc had invalid directivesRainer Gerhards2012-04-201-2/+2
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-192-2/+4
| |\|
* | | bugfix/omfile: template action parameter was not acceptedRainer Gerhards2012-05-032-1/+4
* | | better debug instrumentation --> input thread names used for reportingRainer Gerhards2012-05-023-8/+32
* | | Merge branch 'master-fieldext'Rainer Gerhards2012-04-265-63/+97
|\ \ \
| * | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-265-63/+97
* | | | cleanup: removed unused but set parametersRainer Gerhards2012-04-235-10/+4
* | | | bugfix: omudpspoof did not work correctly if no spoof hostname was configuredRainer Gerhards2012-04-232-1/+3
* | | | bugfix: number conversion in expression evaluation was not always correctRainer Gerhards2012-04-231-2/+4
|/ / /
* | | Merge branch 'v5-beta'Rainer Gerhards2012-04-191-0/+4
|\ \ \
| * \ \ Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-192-2/+6
| |\ \ \
| | * \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-191-0/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | doc: added last bugfix to ChangeLogRainer Gerhards2012-04-191-0/+2
| | | * | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | * | | doc: add last bugfix to changelogRainer Gerhards2012-04-192-1/+3
| | * | | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| * | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-184-5/+45
| |\| | |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-180-0/+0
| | |\| |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-184-5/+45
| | |\ \ \
* | | | | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-195-59/+181
* | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-186-5/+76
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-184-8/+45
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | fixed compile bugRainer Gerhards2012-04-181-1/+1
| | | |_|/ | | |/| |
| | * | | bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-184-8/+45
| * | | | doc: added new $uptime propertyRainer Gerhards2012-04-131-0/+4
| * | | | Add a system property, PROP_SYS_UPTIME, to place up-time markers into rsyslog...Steven A. Falco2012-04-132-0/+21
* | | | | bugfix/imuxsock: configured hostname was not usedRainer Gerhards2012-04-162-1/+3
* | | | | bugfix/imuxsock: solving abort if hostname was not setRainer Gerhards2012-04-162-2/+5
* | | | | make "old" omelasticsearch compileRainer Gerhards2012-04-161-1/+0
* | | | | preparing for 6.3.8 releasev6.3.8Rainer Gerhards2012-04-161-1/+1
* | | | | bugfix: report error if module tries to request more strings than supportedRainer Gerhards2012-04-132-4/+8
* | | | | imuxsock: mini bugfix: closed fd was tried to close a second timeRainer Gerhards2012-04-131-3/+6
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-120-0/+0
|\| | | |
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-126-136/+171
| |\| | |
* | | | | Merge branch 'v5-beta'Rainer Gerhards2012-04-129-138/+210
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | preparing for 5.9.6v5.9.6Rainer Gerhards2012-04-124-9/+15
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-126-120/+168
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-126-120/+168
| | |\ \ \ | | | | |/ | | | |/|
| | | * | imuxsock: do not cache hostnameRainer Gerhards2012-04-122-11/+5