summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* preparing for 6.1.12 releasev6.1.12Rainer Gerhards2011-08-313-16/+16
* cosmetic: adding imported bugfix to ChangeLogRainer Gerhards2011-08-311-0/+1
* Merge branch 'v5-stable' into betaRainer Gerhards2011-08-313-25/+25
|\
| * bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-313-25/+25
* | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-302-7/+9
|\|
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-302-6/+7
| |\
| | * added bug info to ChangeLogRainer Gerhards2011-08-301-2/+3
| | * Merge branch 'v4-stable-rhel-bug' into v4-stableRainer Gerhards2011-08-301-1/+1
| | |\
| | | * bugfix: off-by-one(two) bug in legacy syslog parserRainer Gerhards2011-08-101-1/+1
| | * | Added MsgDup bugfix from v5-stable into v4-stable branchAndre Lorbach2011-08-112-1/+2
| | |/
* | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-186-7/+47
|\| |
| * | removed debug code from action.c and runtime/queue.c after testingAndre Lorbach2011-08-182-21/+0
| * | bugfix: fixed incorrect state handling for Discard Action (transactions)Andre Lorbach2011-08-184-3/+49
| * | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableAndre Lorbach2011-08-121-2/+2
| |\ \
| | * | minor doc: made body tag parsable for web site scriptsRainer Gerhards2011-08-121-2/+2
| * | | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-123-1/+8
| |/ /
| * | bugfixes for tag emulationRainer Gerhards2011-08-112-3/+8
* | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-112-2/+6
|\| |
| * | fixed typo in changelogAndre Lorbach2011-08-101-1/+1
| * | added changelog entryAndre Lorbach2011-08-101-0/+3
| * | Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTagAndre Lorbach2011-08-101-1/+1
| * | preparing for version 5.8.4v5.8.4root2011-08-103-3/+3
* | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-102-3/+13
|\| |
| * | Added changelog entry for bugid 275Andre Lorbach2011-08-101-0/+3
| * | Merge branch 'v5-stable-msgidfix' into v5-stableAndre Lorbach2011-08-101-3/+10
| |\ \
| | * | Cosmetic changeAndre Lorbach2011-07-271-2/+2
| | * | Fixed a stupid return bug introduced by the last commitAndre Lorbach2011-07-271-1/+2
| | * | Experimentally added mutex lock in getMSGID in order to fix bug 275.Andre Lorbach2011-07-261-3/+9
* | | | minor: added imported bug to ChangeLogRainer Gerhards2011-08-091-0/+3
* | | | Merge branch 'v5-stable' into betaRainer 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
* | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-053-8/+20
|\| | |
| * | | 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
| |\| |
* | | | Merge branch 'v4-stable' into betaRainer Gerhards2011-07-111-7/+9
|\ \ \ \ | | |/ / | |/| |
| * | | doc: updated rsyslog.conf man page with new syntaxesRainer Gerhards2011-07-111-7/+9
* | | | preparing for 6.1.11v6.1.11Rainer Gerhards2011-07-113-3/+3
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-117-12/+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