summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-betaRainer 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
* | 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
| |/
| * fixed compile bugRainer Gerhards2012-04-181-1/+1
* | 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
| |\|
| | * bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-183-8/+41
* | | 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
* | | 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' into v5-stable-newstatsRainer Gerhards2012-04-071-4/+8
| |\|
| | * bugfix: segfault on startup if $actionqueuefilename was missing for disk queu...Tomas Heinrich2012-04-051-1/+2
| | * bugfix: segfault if disk-queue was started up with old queue fileTomas Heinrich2012-04-051-3/+6
| * | 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
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-144-38/+60
|\| |
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-144-38/+60
| |\|
| | * changed statsobj interface and added better docRainer Gerhards2012-03-144-38/+60
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-127-5/+74
|\| |
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-123-2/+11
| |\|
| | * bugfix: stopped DA queue was never processed after a restartRainer Gerhards2012-03-123-2/+11
| * | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-062-3/+57
| * | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-212-0/+2
| * | stats: added unique (and friendly) name for ruleset queuesRainer Gerhards2012-01-311-1/+4
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-303-16/+19
| |\|
* | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-013-16/+19
|\ \ \ | | |/ | |/|
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-273-16/+19
| |\ \
| | * | bugfix: omprog made rsyslog abort on startup if not binary to execute was con...Rainer Gerhards2012-01-271-0/+1
| | * | relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | * | increased max config file line size to 64kRainer Gerhards2012-01-241-1/+4
* | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-1667-1036/+912
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-1667-1036/+912
| |\| |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| | |\|
| | | * license changesRainer Gerhards2012-01-1645-704/+617
| | | * runtime license changeRainer Gerhards2012-01-1620-297/+265
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| | |\|
| | | * license changeRainer Gerhards2012-01-142-35/+30
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-091-5/+5
| |\| |
* | | | part of merge, but forgot to add to merge setRainer Gerhards2012-01-101-0/+3
* | | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-101-1/+5
|\ \ \ \
| * \ \ \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-1/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-1/+5
* | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-01-091-5/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |