summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-075-2/+39
|\
| * Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-1/+1
| |\
| * \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-1/+6
| |\ \
| * | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-0/+13
| * | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-201-0/+6
| * | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-191-0/+6
| * | | added capability to use a local interface IP address as fromhost-ip for imklogRainer Gerhards2012-03-102-1/+6
| * | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-1/+6
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-051-1/+1
| |\ \ \
| * \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-241-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'v6-stable'Rainer Gerhards2012-04-071-0/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-071-0/+5
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | preparing for 5.8.10v5.8.10Rainer Gerhards2012-04-071-1/+1
| | | |_|_|/ | | |/| | |
| | * | | | doc: noted disk queue format change from v4->v5Rainer Gerhards2012-04-051-0/+5
| | * | | | preparing for 5.8.9v5.8.9Rainer Gerhards2012-03-151-1/+1
| | | |_|/ | | |/| |
| | * | | preparing for 5.8.8v5.8.8Rainer Gerhards2012-03-051-1/+1
| | | |/ | | |/|
| | * | preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-171-1/+1
| * | | final prep for 6.2.0v6.2.0Rainer Gerhards2012-01-091-1/+1
* | | | impstats: added $PStatsJSON directiveRainer Gerhards2012-04-011-0/+4
* | | | added "date-unixtimestamp" property replacer option to format as a unix times...Rainer Gerhards2012-03-291-0/+4
* | | | added "json" property replacer optionRainer Gerhards2012-03-161-0/+6
* | | | added message property parsesuccess to indicate status of higher level parser...Rainer Gerhards2012-03-151-0/+19
* | | | upgraded omlibdbi to support the new v6 config formatRainer Gerhards2012-02-021-22/+34
* | | | ommysql: updated docRainer Gerhards2012-02-021-16/+30
* | | | preparing for 6.3.7Rainer Gerhards2012-01-311-1/+1
* | | | Merge branch 'v5-devel' into masterRainer Gerhards2012-01-183-1/+9
|\ \ \ \
| * | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-161-1/+4
| * | | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-102-0/+5
| |\ \ \ \
| | * \ \ \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+1
| | |\ \ \ \
| | | * | | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-0/+1
| | * | | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+4
| | |\| | | |
| | | * | | | added canned template for ultra-exact sysklogd file formatTomas Heinrich2012-01-101-0/+4
* | | | | | | finally cleaning up the syslog-ng rsyslog comparisonRainer Gerhards2012-01-091-112/+123
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-01-094-43/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-094-43/+2
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-191-1/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-194-4/+49
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | added instrumentationRainer Gerhards2011-12-191-1/+3
| | | |_|_|/ | | |/| | |
| * | | | | more work on queue statistics counterRainer Gerhards2011-12-161-1/+3
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-161-5/+23
|\| | | | |
| * | | | | preparing for 5.9.4v5.9.4Rainer Gerhards2011-11-291-1/+1
| * | | | | imuxsock: added capability to "annotate" messages with "trusted information",Rainer Gerhards2011-11-291-5/+23
* | | | | | Merge branch 'beta'Rainer Gerhards2011-12-162-0/+44
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-162-0/+44
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-162-0/+44
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | added doc for omprogRainer Gerhards2011-12-162-0/+44
* | | | | | Merge branch 'beta'Rainer Gerhards2011-12-122-4/+5
|\| | | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-011-3/+2
| |\| | | |
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-11-031-3/+2
| | |\| | |
| | | * | | doc bugfix: typo in imgssapi docRainer Gerhards2011-11-031-3/+2