summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* one further change to support gnutls without libgcryptRainer Gerhards2011-10-211-0/+2
* Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-219-16/+30
|\
| * 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
| |\
| | * 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
| * | | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
| |/ /
| * | bugfix: $OMFileFlushInterval period was doubled - now using correct valueRainer Gerhards2011-10-182-1/+2
* | | removed dependency on gcrypt for recently-enough GnuTLSRainer Gerhards2011-10-173-2/+12
* | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-177-26/+82
|\| |
| * | 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: 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: ActionQueue could malfunction due to index errorVlad Grigorescu2011-10-172-9/+11
| |/ /
| * | 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 v5-develRainer Gerhards2011-09-263-22/+52
|\| |
| * | 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
| | * | | typo fixAndrew Stothard2011-09-152-2/+2
| | |/ /
| | * | preparing for 4.6.8 releasev4.6.8Rainer Gerhards2011-08-312-2/+2
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-073-6/+17
|\| | |
| * | | bugfix: imuxsock did no longer ignore message-provided timestamp,Rainer Gerhards2011-09-072-5/+13
| * | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-052-1/+5
| * | | preparing for 5.8.5 releasev5.8.5Rainer Gerhards2011-08-312-2/+2
* | | | preparing for 5.9.3 releasev5.9.3Rainer Gerhards2011-08-312-2/+2
* | | | cosmetic: adding imported bugfix to ChangeLogRainer Gerhards2011-08-311-1/+2
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-313-25/+25
|\| | |
| * | | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-313-25/+25
* | | | Merge branch 'v4-beta' into v5-develRainer Gerhards2011-08-301-0/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | 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 'v5-stable' into v5-develRainer Gerhards2011-08-302-7/+9
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |