summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into betaRainer Gerhards2011-08-301-3/+1
|\
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-301-3/+1
| |\
| | * bugfix: off-by-one(two) bug in legacy syslog parserRainer Gerhards2011-08-101-1/+1
* | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-181-0/+2
|\| |
| * | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-121-0/+2
| * | 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
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-111-1/+16
|\ \ \ | | |/ | |/|
| * | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-111-1/+8
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-1/+9
| |\|
| | * support for :omfile: forward compatibility directiveRainer Gerhards2011-07-111-1/+9
* | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-061-2/+10
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-061-1/+3
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-061-1/+3
| |\|
| | * added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-061-1/+3
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-06-211-1/+1
|\| |
| * | bugfix: problems in failover action handlingRainer Gerhards2011-06-161-1/+1
* | | bugfix: $ActionFileDefaultTemplate did not workRainer Gerhards2011-06-021-5/+5
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-05-092-4/+3
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-091-2/+2
| |\|
| | * bugfix: invalid storage type for config variablesRainer Gerhards2011-05-091-1/+1
| | * bugfix: stream driver mode was not correctly set on tcp ouput on big endian s...Tomas Heinrich2011-05-091-1/+1
| * | bugfix(minor): improper template function call in syslogd.cRainer Gerhards2011-04-191-1/+1
* | | omfwd: made send function handling incomplete sends correctlyRainer Gerhards2011-04-041-12/+7
* | | added one more testcase for sending TCP/TLS syslogRainer Gerhards2011-04-041-0/+4
* | | omfwd: speeded up tcp forwarding by reducing number of API callsRainer Gerhards2011-04-041-11/+66
* | | Merge branch 'v5-devel'Rainer Gerhards2011-03-312-3/+2
|\| |
| * | bugfix: RFC5424 parser confused by empty structured dataRainer Gerhards2011-03-221-2/+1
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-161-1/+1
| |\ \
| | * | fixed a regression of last patch and some cleanupRainer Gerhards2011-03-161-1/+1
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-03-1113-0/+17
|\| | |
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-081-0/+5
| |\| |
| | * | bugfix(kind of): tell users that config graph can currently not be generatedRainer Gerhards2011-03-081-0/+5
| * | | Merge branch 'v5-beta-gtls-fix' into v5-betaRainer Gerhards2011-03-0612-0/+12
| |\ \ \
| | * | | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-2312-0/+12
* | | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-252-3/+1
|\| | | |
| * | | | cosmetic: removing commented-out testing aidRainer Gerhards2011-02-251-1/+0
| |/ / /
| * | | bugfix (minor): warning message suggested invalid compatibility modeRainer Gerhards2011-02-221-1/+1
| * | | regression: fixed compile error with --enable-debugRainer Gerhards2011-02-211-1/+0
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-183-10/+6
|\| | |
| * | | bugfix: fixed compile problem due to empty structsDražen Kačar2011-02-161-0/+1
| * | | cleanup: no longer parameter in iminternal system removedRainer Gerhards2011-02-163-10/+6
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-111-3/+36
|\| | |
| * | | fixed some compile issues in recent systemd patchRainer Gerhards2011-02-111-1/+1
| * | | Improved systemd socket activation supportMarius Tomaschewski2011-02-111-3/+36
* | | | Merge branch 'v5-devel'Rainer Gerhards2010-12-175-17/+10
|\| | |
| * | | Merge branch 'v4-devel' into v5-develRainer Gerhards2010-12-171-3/+0
| |\ \ \
| | * | | added $LocalHostName config directive & some bugfixingRainer Gerhards2010-12-161-3/+3
| | * | | cleanup of cosmetic nit (result of clang static code analyser run)Rainer Gerhards2010-12-161-1/+1