summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | added a first implementation of a DNS name cacheRainer Gerhards2011-06-061-0/+3
* | | | | | | regression fix: config validation code affected by recent changesRainer Gerhards2011-05-301-0/+4
* | | | | | | Merge branch 'beta'Rainer Gerhards2011-05-211-3/+2
|\| | | | | |
| * | | | | | 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
* | | | | | merge fix: made mistake when merging in v5-devel changes, now fixingRainer Gerhards2011-04-272-18/+1
* | | | | | step: moved main message queue activation to after priv dropRainer Gerhards2011-04-271-12/+1
* | | | | | step: config-specific module list used during config processingRainer Gerhards2011-04-271-1/+1
* | | | | | step: shuffled module-related code from syslogd.c to rsconf.cRainer Gerhards2011-04-271-217/+52
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-04-262-29/+22
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | bugfix: pipes not opened in full priv mode when privs are to be droppedRainer Gerhards2011-04-261-5/+13
| * | | | | bugfix: do not open files with full privileges, if privs will be droppedRainer Gerhards2011-04-261-36/+15
| | |/ / / | |/| | |
* | | | | step: outchannel list integrated into main config objectRainer Gerhards2011-04-261-41/+20
* | | | | step: moved config validation codeRainer Gerhards2011-04-261-20/+0