Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added $InputRELPServerBindRuleset directive to specify rulesets for RELP | Rainer Gerhards | 2011-09-08 | 1 | -1/+2 |
| | |||||
* | Merge branch 'beta' | Rainer Gerhards | 2011-08-30 | 1 | -3/+1 |
|\ | | | | | | | | | Conflicts: ChangeLog | ||||
| * | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-08-30 | 1 | -3/+1 |
| |\ | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-08-30 | 1 | -3/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/syslogd.c | ||||
| | | * | bugfix: off-by-one(two) bug in legacy syslog parser | Rainer Gerhards | 2011-08-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'beta' | Andre Lorbach | 2011-08-18 | 1 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c | ||||
| * | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 1 | -0/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | * | | Added debug output into message parsers needed for bugtracking | Andre Lorbach | 2011-08-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Changed version to 5.8.5-pre1 | ||||
| * | | | Merge branch 'v4-stable' into beta | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-11 | 1 | -1/+16 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
* | | | | | regression: omfile aborted on dynafiles (never released bug) | Rainer Gerhards | 2011-08-01 | 1 | -4/+3 |
| | | | | | |||||
* | | | | | working around automake curiosity | Rainer Gerhards | 2011-07-22 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | build system cleanup/improvement | Rainer Gerhards | 2011-07-22 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | omusrmsg now supports the new config system | Rainer Gerhards | 2011-07-21 | 2 | -39/+128 |
| | | | | | |||||
* | | | | | milestone: omfile basically gets its parameters via the new system | Rainer Gerhards | 2011-07-21 | 1 | -47/+151 |
| | | | | | | | | | | | | | | | | | | | | | | | | | but not all syntax handlers are present (so it does not yet fully work). | ||||
* | | | | | milestone: new output plugin interface call added | Rainer Gerhards | 2011-07-21 | 2 | -0/+4 |
| | | | | | |||||
* | | | | | milestone: on the way to a new action conf interface to plugins... | Rainer Gerhards | 2011-07-20 | 1 | -0/+81 |
| | | | | | |||||
* | | | | | cleanup | Rainer Gerhards | 2011-07-20 | 1 | -21/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' | Rainer Gerhards | 2011-07-13 | 1 | -7/+9 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | * | | doc: updated rsyslog.conf man page with new syntaxes | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
| | | | | |||||
* | | | | Merge branch 'master-newconf' | Rainer Gerhards | 2011-07-12 | 3 | -244/+16 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/omfile.c | ||||
| * | | | | removed compatibility mode as we expect people have adjusted their confs by now | Rainer Gerhards | 2011-07-12 | 1 | -234/+13 |
| | | | | | |||||
| * | | | | removed emergency config, do error reporting on fatal config file error | Rainer Gerhards | 2011-07-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | cleanup, removing now unused code | Rainer Gerhards | 2011-07-11 | 2 | -6/+0 |
| | | | | | |||||
| * | | | | milestone/[PARTWORK]: made sure all legacy selectors work | Rainer Gerhards | 2011-07-09 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ... except for the not guaranteed $outchannel construct, which we could not fix without syntax change. Shouldn't hurt too many. | ||||
| * | | | | milestone/[PARTWORK]: implemented comparison operations | Rainer Gerhards | 2011-07-08 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | milestone:/[PARTWORK]: config is processed using new parser, except... | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | ... for "if" filters (more work to come, probably lots of more work... ;)) | ||||
| * | | | | milestone/[NONWORKING]: first integration of new parser, rules are not yet ↵ | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | handled | ||||
| * | | | | milestone: grammar integrated in rsyslog build system | Rainer Gerhards | 2011-07-05 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-07-11 | 1 | -1/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-11 | 1 | -1/+16 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| | * | | | | added warning message for old-style outchannel syntax | Rainer Gerhards | 2011-07-11 | 1 | -1/+8 |
| | | | | | | |||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -1/+9 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh | ||||
| | | * | | | support for :omfile: forward compatibility directive | Rainer Gerhards | 2011-07-11 | 1 | -1/+9 |
| | | | | | | |||||
| * | | | | | issue a warning if old omusrmsg action syntax is used | Rainer Gerhards | 2011-07-06 | 1 | -2/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-06 | 1 | -1/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| * | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-16 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | | | | | | bugfix: error state not correctly set for gone-away config directive | Rainer Gerhards | 2011-06-10 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2011-05-09 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c tests/Makefile.am | ||||
| | * \ \ \ \ \ | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-09 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c | ||||
| * | \ \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-05-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'beta' | Rainer Gerhards | 2011-07-06 | 1 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | | | | | | issue a warning if old omusrmsg action syntax is used | Rainer Gerhards | 2011-07-06 | 1 | -2/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-06 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| | * | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | | | | | added support for the ":omusrmsg:" syntax in configuring user messages | Rainer Gerhards | 2011-07-06 | 1 | -1/+3 |
| | | | |_|_|/ | | | |/| | | | |||||
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-06-21 | 2 | -6/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh | ||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | ||||
| | * | | | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!) |