summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-092-1/+7
|\
| * cosmetic: add imported bugfix to ChangeLogRainer Gerhards2011-08-091-0/+3
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-092-1/+4
| |\
| | * bugfix: memcpy overflow can occur in allowed sender checkingMarius Tomaschewski2011-08-092-1/+4
* | | added capability to emit config error location info for warningsRainer Gerhards2011-08-095-6/+35
* | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-054-15/+29
|\| |
| * | Merge branch 'v4-stable' into v5-stableAndre Lorbach2011-08-051-0/+4
| |\|
| | * Merge branch 'v3-stable' into v4-stableAndre Lorbach2011-08-052-7/+11
| | |\
| | | * bugfix: potential misadressing in property replacerAndre Lorbach2011-08-052-7/+8
| * | | Added changelog entryAndre Lorbach2011-08-051-0/+3
| * | | bugfix: potential misadressing in property replacerAndre Lorbach2011-08-051-7/+9
| * | | doc: cleanup of copy-and-paste error in commentRainer Gerhards2011-07-131-1/+1
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-7/+9
| |\| |
| | * | doc: updated rsyslog.conf man page with new syntaxesRainer Gerhards2011-07-111-7/+9
* | | | preparing for 5.9.2v5.9.2Rainer Gerhards2011-07-112-2/+2
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-116-7/+48
|\| | |
| * | | preparing for 5.8.3v5.8.3Rainer Gerhards2011-07-113-3/+6
| * | | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-113-1/+28
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-115-6/+16
| |\| |
| | * | preparing for 4.6.7 releasev4.6.7Rainer Gerhards2011-07-118-15/+16
| | * | support for :omfile: forward compatibility directiveRainer Gerhards2011-07-113-3/+11
* | | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-062-2/+11
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-066-11/+30
|\| | |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-065-11/+23
| |\| |
| | * | added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-063-8/+19
| | * | doc: ./configure --help invalidly showed imdiag enabled by defaultRainer Gerhards2011-07-061-1/+1
| | * | preparing for 4.6.6v4.6.6Rainer Gerhards2011-06-243-3/+3
| * | | doc: mentioned Lennart's patch in ChangeLogRainer Gerhards2011-07-021-0/+3
| * | | systemd: direct stdout/stderr of rsyslog to nullLennart Poettering2011-07-021-0/+1
| * | | reduced sporadic failures during make checkRainer Gerhards2011-06-301-9/+14
* | | | preparing for 5.9.1 releasev5.9.1Rainer Gerhards2011-06-304-6/+3
* | | | cosmetic: reformatted some codeRainer Gerhards2011-06-301-12/+5
* | | | backported patch for testbench race reductionRainer Gerhards2011-06-301-9/+14
* | | | added support for obtaining timestamp for kernel message from messageRainer Gerhards2011-06-246-99/+130
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-2114-69/+177
|\| | |
| * | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2Rainer Gerhards2011-06-213-5/+16
| * | | preparing for 5.8.2Rainer Gerhards2011-06-214-4/+5
| * | | testbench: added new tests for failover casesRainer Gerhards2011-06-2010-52/+130
| * | | bugfix: problems in failover action handlingRainer Gerhards2011-06-203-10/+14
* | | | added support for obtaining timestamp from system for imuxsockRainer Gerhards2011-06-206-47/+132
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-1610-57/+195
|\| | |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-162-1/+7
| |\| |
| | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-06-162-1/+7
| | |\|
| | | * bugfix: timestamp was incorrectly calculated for timezones with minute offsetRainer Gerhards2011-06-162-1/+4
| * | | failover problem was not totally solved, now (hopefully ;))Rainer Gerhards2011-06-162-28/+64
| * | | bugfix: problems in failover action handlingRainer Gerhards2011-06-165-52/+106
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-151-1/+15
| |\| |
| | * | doc: clarified requirements for $WorkDirectory directiveRainer Gerhards2011-06-151-1/+2
| * | | bugfix/improvement:$WorkDirectory now gracefully handles trailing slashesRainer Gerhards2011-06-153-1/+24
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-148-57/+615
|\| | |