summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\ \ \
| | | | * | | preparing for 4.7.5 releasev4.7.5Rainer Gerhards2011-08-311-1/+1
| | | | * | | preparing for 4.7.4v4.7.4Rainer Gerhards2011-07-111-1/+1
| | | | * | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-0/+19
| | | | * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-114-10/+17
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-091-0/+1
| | | | |\ \ \ \
| | | * | | | | | preparing for 4.6.8 releasev4.6.8Rainer Gerhards2011-08-311-1/+1
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | preparing for 5.8.5 releasev5.8.5Rainer Gerhards2011-08-311-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | preparing for 6.1.12 releasev6.1.12Rainer Gerhards2011-08-311-1/+1
* | | | | | | preparing for 6.3.6 releasev6.3.6Rainer Gerhards2011-09-191-1/+2
* | | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELPRainer Gerhards2011-09-081-3/+6
* | | | | | | preparing for 6.3.5 releaseRainer Gerhards2011-08-311-1/+1
* | | | | | | Merge branch 'beta'Andre Lorbach2011-08-181-2/+2
|\| | | | | |
| * | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-181-2/+2
| |\| | | | |