summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'beta'Rainer Gerhards2011-08-301-3/+1
|\
| * 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 'beta'Andre Lorbach2011-08-181-0/+2
|\| | |
| * | | 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 betaRainer Gerhards2011-07-111-7/+9
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-111-1/+16
| |\ \ \
* | | | | regression: omfile aborted on dynafiles (never released bug)Rainer Gerhards2011-08-011-4/+3
* | | | | working around automake curiosityRainer Gerhards2011-07-221-1/+4
* | | | | build system cleanup/improvementRainer Gerhards2011-07-221-1/+2
* | | | | omusrmsg now supports the new config systemRainer Gerhards2011-07-212-39/+128
* | | | | milestone: omfile basically gets its parameters via the new systemRainer Gerhards2011-07-211-47/+151
* | | | | milestone: new output plugin interface call addedRainer Gerhards2011-07-212-0/+4
* | | | | milestone: on the way to a new action conf interface to plugins...Rainer Gerhards2011-07-201-0/+81
* | | | | cleanupRainer Gerhards2011-07-201-21/+1
* | | | | Merge branch 'v5-stable'Rainer Gerhards2011-07-131-7/+9
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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
* | | | Merge branch 'master-newconf'Rainer Gerhards2011-07-123-244/+16
|\ \ \ \
| * | | | removed compatibility mode as we expect people have adjusted their confs by nowRainer Gerhards2011-07-121-234/+13
| * | | | removed emergency config, do error reporting on fatal config file errorRainer Gerhards2011-07-121-1/+1
| * | | | cleanup, removing now unused codeRainer Gerhards2011-07-112-6/+0
| * | | | milestone/[PARTWORK]: made sure all legacy selectors workRainer Gerhards2011-07-091-0/+8
| * | | | milestone/[PARTWORK]: implemented comparison operationsRainer Gerhards2011-07-081-1/+0
| * | | | milestone:/[PARTWORK]: config is processed using new parser, except...Rainer Gerhards2011-07-061-1/+1
| * | | | milestone/[NONWORKING]: first integration of new parser, rules are not yet ha...Rainer Gerhards2011-07-061-1/+1
| * | | | milestone: grammar integrated in rsyslog build systemRainer Gerhards2011-07-051-1/+1
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-07-111-1/+16
|\ \ \ \ \
| * \ \ \ \ Merge branch 'v5-stable' into v5-develRainer 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 v5-develRainer Gerhards2011-07-061-1/+3
| |\| | | |
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-161-1/+1
| |\ \ \ \ \
| * | | | | | bugfix: error state not correctly set for gone-away config directiveRainer Gerhards2011-06-101-0/+1
| * | | | | | Merge branch 'v4-devel' into v5-develRainer Gerhards2011-05-091-2/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-091-2/+2
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-031-1/+1
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2011-07-061-2/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | 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 'beta'Rainer Gerhards2011-06-212-6/+6
|\| | | | | |
| * | | | | | 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