summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta'Rainer Gerhards2011-12-164-4/+49
|\
| * Merge branch 'v5-stable' into betaRainer Gerhards2011-12-164-4/+49
| |\
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-164-4/+49
| | |\
| | | * bugfix: potential fatal abort in omgssapiTomas Heinrich2011-12-162-4/+4
| | | |
| | | * added doc for omprogRainer Gerhards2011-12-163-0/+45
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2011-12-125-6/+10
|\| | |
| * | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-014-5/+7
| |\| |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-013-2/+5
| | |\| | | | | | | | | | | | | | | | | Conflicts: action.c
| | | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-013-2/+5
| | | |\
| | | | * bugfix: action resume interval incorrectly handled, thus took longer to resumeTomas Heinrich2011-12-012-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | | | * bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-012-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | 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-276-34/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-272-3/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-272-3/+15
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-272-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-216-9/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-213-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html
| * | | | | bugfix (kind of): removed numerical part from pri-textRainer Gerhards2011-10-214-27/+72
| | | | | | | | | | | | | | | | | | | | | | | | see v6 compatibility document for reasons
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-10-2111-19/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-219-16/+30
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | see: http://bugzilla.adiscon.com/show_bug.cgi?id=289
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-177-26/+82
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | | Merge branch 'beta'Rainer Gerhards2011-10-177-38/+103
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | 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
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | bugfix: ActionQueue could malfunction due to index errorVlad Grigorescu2011-10-172-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-135-16/+69
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | bugfix: race condition when extracting structured data and PROCIDRainer Gerhards2011-10-132-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME
| | * | | | | bugfix: race condition when extracting program name and APPNAMERainer Gerhards2011-10-132-5/+27
| | |/ / / / | | | | | | | | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names
| | * | | | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-073-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas.
| | * | | | fixed compiler warnings in tcpflood.cRainer Gerhards2011-10-061-2/+3
| | | | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-266-16/+73
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
generated by cgit (git 2.34.1) at 2024-11-16 15:28:28 +0000