summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-251-1/+3
| |\| | | |
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-251-1/+3
| | |\| | |
| | | * | | doc: imfile: clarified that empty lines are not processedRainer Gerhards2011-10-251-1/+3
* | | | | | Merge branch 'beta'Rainer Gerhards2011-10-273-29/+59
|\| | | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-2/+1
| |\ \ \ \ \
| * | | | | | bugfix (kind of): removed numerical part from pri-textRainer Gerhards2011-10-212-25/+68
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-10-212-5/+5
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-212-5/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | preparing for 5.8.6 releasev5.8.6Rainer Gerhards2011-10-211-1/+1
| | | |/ / / | | |/| | |
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-202-5/+5
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | doc bugfix: pri-text neees to be fixed in an article as wellRainer Gerhards2011-10-201-3/+3
| | | * | | doc bug: property pri-text was incorrectly describedRainer Gerhards2011-10-201-2/+2
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-171-0/+2
| |\| | | |
| * | | | | preparing for 5.9.3 releasev5.9.3Rainer Gerhards2011-08-311-1/+1
| * | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-161-2/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2011-10-171-0/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-171-0/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-171-0/+2
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | doc: clarified that imklog does not support SolarisRainer Gerhards2011-10-171-0/+2
| | | * | | | Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0Rainer Gerhards2011-09-0714-22/+348
| | | |\ \ \ \