summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-091-5/+5
| * | | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+2
* | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-201-0/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+2
* | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-4/+0
|\| | | |
| * | | | better performance for action stats & cleanup: removing debug printsRainer Gerhards2011-12-191-4/+0
* | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-3/+7
|\| | | |
| * | | | added instrumentationRainer Gerhards2011-12-192-1/+12
| |/ / /
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-011-1/+1
| |\| |
| | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-011-1/+1
| | |\ \
| | | * | bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-011-1/+1
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-271-2/+6
| |\| | |
| | * | | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-271-2/+6
| | * | | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-111-1/+1
| | |\ \ \
| | | * | | Added MsgDup bugfix from v5-stable into v4-stable branchAndre Lorbach2011-08-111-1/+1
| | * | | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-091-1/+1
| | |\| | |
| | * | | | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-7/+7
| | |\ \ \ \
| | * | | | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-0/+1
| | * | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-111-1/+1
| | |\ \ \ \ \
* | | | | | | | experimental: added first stats counter to action objectRainer Gerhards2011-12-161-1/+1
* | | | | | | | more work on queue statistics counterRainer Gerhards2011-12-162-5/+10
* | | | | | | | new stats counter "discarded" for queue objectRainer Gerhards2011-12-162-0/+6