summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 'v5-stable' into betaRainer Gerhards2011-10-272-3/+18
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-272-3/+15
| |\|
| | * bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-272-3/+10
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-216-9/+22
|\| |
| * | preparing for 5.8.6 releasev5.8.6Rainer Gerhards2011-10-213-3/+3
| * | bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-215-6/+18
| * | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2011-10-212-5/+5
| |\ \
| * | | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-213-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| * | bugfix: $OMFileFlushInterval period was doubled - now using correct valueRainer Gerhards2011-10-182-1/+2
* | | bugfix (kind of): removed numerical part from pri-textRainer Gerhards2011-10-214-27/+72
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-173-10/+17
|\| |
| * | 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 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2011-10-173-9/+54
| |\ \
| | * | doc: mention imported bugfix in ChangeLogRainer Gerhards2011-10-131-0/+2
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-132-1/+2
| | |\|
| | | * bugfix: $ActionExecOnlyOnce interval did not work properlyTomas Heinrich2011-10-132-1/+2
| * | | bugfix: ActionQueue could malfunction due to index errorVlad Grigorescu2011-10-172-9/+11
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-135-16/+69
|\ \ \ \ | | |/ / | |/| |
| * | | bugfix: race condition when extracting structured data and PROCIDRainer Gerhards2011-10-132-5/+25
| * | | bugfix: race condition when extracting program name and APPNAMERainer Gerhards2011-10-132-5/+27
| |/ /
| * | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-073-6/+12
| * | fixed compiler warnings in tcpflood.cRainer Gerhards2011-10-061-2/+3
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-266-16/+73
|\| |
| * | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-263-4/+5
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-09-223-6/+40
| |\|
| | * bugfix: potential abort if ultra-large file io buffers are used andRainer Gerhards2011-09-202-4/+15
| | * Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stableRainer Gerhards2011-09-15101-381/+5139
| | |\
| | | * Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0Rainer Gerhards2011-09-07101-381/+5139
| | | |\
| | | | * preparing for 4.7.5 releasev4.7.5Rainer Gerhards2011-08-313-3/+3
| | | | * Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-302-4/+6
| | | | |\
| | | | * | Added changelog entryAndre Lorbach2011-08-111-0/+1
| | | | * | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-112-1/+2
| | | | |\ \
| | | | * \ \ Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-092-1/+4
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-053-14/+23
| | | | |\ \ \ \
| | | | * | | | | preparing for 4.7.4v4.7.4Rainer Gerhards2011-07-113-3/+3
| | | | * | | | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-113-1/+28
| | | | * | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-1114-29/+58
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-06-143-4/+12
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-201-5/+0
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-112-2/+16
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-0915-21/+143
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | bugfix: a slightly more informative error message when a TCPRainer Gerhards2011-05-023-5/+11