summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-beta' into betaRainer Gerhards2012-06-011-10/+16
|\
| * Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-011-10/+16
| |\
| | * some better code to handle queue congestionRainer Gerhards2012-06-011-10/+15
* | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-292-3/+2
|\| |
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-292-3/+2
| |\|
| | * bugfix: if debug message could end up in log file when forkingTomas Heinrich2012-05-292-3/+2
| * | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-101-11/+5
* | | Merge branch 'v6-stable'Rainer Gerhards2012-05-101-11/+5
|\ \ \
| * \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-101-11/+5
| |\ \ \ | | | |/ | | |/|
| | * | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-101-11/+5
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-101-13/+0
| |\| |
* | | | Merge branch 'v5-beta'Rainer Gerhards2012-05-101-13/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-101-13/+0
| |\ \ \ | | | |/ | | |/|
| | * | cleanup: removing no longer needed macrosRainer Gerhards2012-05-041-13/+0
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-031-7/+47
| |\| |
| * | | Merge branch 'v5-stable-field-substring' into v5-betaRainer Gerhards2012-04-271-55/+57
| |\ \ \
| | * | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-271-55/+57
| * | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-183-5/+41
| |\ \ \ \
| | * \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-183-5/+41
| | |\ \ \ \
* | | \ \ \ \ Merge branch 'v6-stable'Rainer Gerhards2012-05-031-6/+47
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-7/+47
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | bugfix: rsyslog did not terminate when delayable inputs were blockedRainer Gerhards2012-05-031-5/+42
| | * | | | | bugfix: inside queue.c, some thread cancel states were not correctly reset.Rainer Gerhards2012-05-031-5/+4
| | * | | | | bugfix: active input in "light delay state" could block rsyslog terminationRainer Gerhards2012-04-271-0/+4
| | | |_|_|/ | | |/| | |
* | | | | | better debug instrumentation --> input thread names used for reportingRainer Gerhards2012-05-021-1/+2
* | | | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-261-55/+57
* | | | | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-191-37/+93
* | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-184-5/+64
|\| | | | |
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-183-8/+41
| |\| | | |
| | * | | | fixed compile bugRainer Gerhards2012-04-181-1/+1
| | | |_|/ | | |/| |
| | * | | bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-183-8/+41
| * | | | Add a system property, PROP_SYS_UPTIME, to place up-time markers into rsyslog...Steven A. Falco2012-04-132-0/+21
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-121-44/+64
| |\| | |
* | | | | bugfix: report error if module tries to request more strings than supportedRainer Gerhards2012-04-132-4/+8
* | | | | Merge branch 'v5-beta'Rainer Gerhards2012-04-121-30/+58
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-30/+58
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-30/+58
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Free also LocalDomain in glbl class destructorMarius Tomaschewski2012-04-111-0/+1
| | | * | bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-111-44/+63
* | | | | Merge branch 'v5-devel'Rainer Gerhards2012-04-071-31/+38
|\| | | |
| * | | | permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-071-31/+38
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-074-53/+123
| |\| | |
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-144-38/+60
| |\ \ \ \
| * \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-127-5/+74
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-013-16/+19
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-078-52/+177
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-4/+8
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-221-1/+1
| * | | | | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-212-47/+113
| * | | | | | | do not provide weblink with meaningless (generic) error codeRainer Gerhards2012-03-211-2/+2
| | |_|_|_|/ / | |/| | | | |