Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-16 | 1 | -1/+15 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | |||||
| * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-06-15 | 1 | -1/+15 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_global.html | |||||
| | * | | | | doc: clarified requirements for $WorkDirectory directive | Rainer Gerhards | 2011-06-15 | 1 | -1/+2 | |
| | | |/ / | | |/| | | ||||||
* | | | | | preparing for 5.9.0v5.9.0 | Rainer Gerhards | 2011-06-10 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'v5-stable-imfile-batches' into v5-devel | Rainer Gerhards | 2011-06-06 | 2 | -3/+10 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | |||||
| * | | | | | imfile: added $InputFileMaxLinesAtOnce directive | Rainer Gerhards | 2011-05-24 | 1 | -2/+9 | |
| |/ / / / | ||||||
| * | | | | preparing for 5.8.1 stablev5.8.1 | Rainer Gerhards | 2011-05-19 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | doc bugfix: yet another typo | Rainer Gerhards | 2011-05-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | ... am I really that dumb... ;) | |||||
* | | | | | mmsnmptrapd: doc bugfix and fix issue with config stmt handler | Rainer Gerhards | 2011-05-13 | 1 | -3/+6 | |
| | | | | | ||||||
* | | | | | added support to control KEEPALIVE settings in imptcp | Rainer Gerhards | 2011-05-13 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | | | | | | this has not yet been added to imtcp, but could be done on request | |||||
* | | | | | imptcp: added capability to activate keep-alive at socket layer | Rainer Gerhards | 2011-05-11 | 1 | -1/+4 | |
| | | | | | ||||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-05-11 | 3 | -0/+102 | |
|\| | | | | ||||||
| * | | | | mmsnmptrapd: added doc & mentioned in ChangeLog | Rainer Gerhards | 2011-05-10 | 3 | -0/+102 | |
| | | | | | ||||||
* | | | | | added capability for imtcp to activate keep-alive packets | Rainer Gerhards | 2011-05-09 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | at the socket layer. reference: http://kb.monitorware.com/post20791.html | |||||
* | | | | | bugfix: do not open files with full privileges, if privs will be dropped | Rainer Gerhards | 2011-04-26 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This make the privilege drop code more bulletproof, but breaks Ubuntu's work-around for log files created by external programs with the wrong user and/or group. Note that it was long said that this "functionality" would break once we go for serious privilege drop code, so hopefully nobody still depends on it (and, if so, they lost...). | |||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-04-15 | 2 | -5/+6 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-04-15 | 1 | -0/+1 | |
| |\| | | | ||||||
| | * | | | bugfix: IPv6-address could not be specified in omrelp | Rainer Gerhards | 2011-04-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | this was due to improper parsing of ":" closes: http://bugzilla.adiscon.com/show_bug.cgi?id=250 | |||||
| * | | | | bugfix: doc for impstats had wrong config statements | Rainer Gerhards | 2011-04-14 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also, config statements were named a bit inconsistent, resolved that problem by introducing an alias and only documenting the consistent statements Thanks to Marcin for bringing up this problem. | |||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-04-12 | 3 | -19/+7 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | | | Merge branch 'v5-beta' into v5-stable | Rainer Gerhards | 2011-04-12 | 12 | -26/+232 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus bump to new v5-stable Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| | * | | | | corrected ActionSendResendLastMsgOnReconnect docs | Marius Tomaschewski | 2011-04-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.de> | |||||
| | * | | | | doc bugfix: doc listed no-longer existing TLS limitations | Rainer Gerhards | 2011-04-01 | 1 | -16/+2 | |
| | | | | | | ||||||
| * | | | | | preparing for 5.6.5v5.6.5 | Rainer Gerhards | 2011-03-22 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | added new config directive $InputTCPFlowControl... | Rainer Gerhards | 2011-04-01 | 1 | -0/+9 | |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | ... to select if tcp received messages shall be flagged as light delayable or not. | |||||
* | | | | | preparing for 5.7.10 | Rainer Gerhards | 2011-03-29 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | enhance: added $BOM system property to ease writing byte order masks | Rainer Gerhards | 2011-03-22 | 1 | -0/+6 | |
| | | | | | ||||||
* | | | | | some minor enhancements to doc set -- point to more examples | Rainer Gerhards | 2011-03-17 | 1 | -4/+7 | |
| | | | | | ||||||
* | | | | | preparing for 5.7.9v5.7.9 | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | preparing for 5.7.8 releasev5.7.8 | Rainer Gerhards | 2011-03-09 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -1/+7 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c | |||||
| * | | | | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 | |||||
| * | | | | preparing for 5.6.4v5.6.4 | Rainer Gerhards | 2011-03-02 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | preparing for v5.6.3v5.6.3 | Rainer Gerhards | 2011-01-26 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | preparing for 5.7.7v5.7.7 | Rainer Gerhards | 2011-03-02 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | preparing for 5.7.6v5.7.6 | Rainer Gerhards | 2011-02-25 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | preparing for 5.7.5 release | Rainer Gerhards | 2011-02-23 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | enhance: imfile did not yet support multiple rulesets, now added | Rainer Gerhards | 2011-02-18 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we do this directly in the beta because a) it does not affect existing functionality and b) one may argue that this missing functionality is close to a bug. | |||||
* | | | | | preparing for 5.7.4 releasev5.7.4 | Rainer Gerhards | 2011-02-17 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | preparing for 5.7.3v5.7.3 | Rainer Gerhards | 2011-02-04 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | removed invalid link from doc | Rainer Gerhards | 2011-02-04 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | added doc for new ommysql directives | Ariel P | 2011-02-01 | 1 | -0/+12 | |
| | | | | | ||||||
* | | | | | enhanced imfile to support multi-line messages | David Lang | 2011-01-25 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | |||||
* | | | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -0/+6 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c | |||||
| * | | | | added $LocalHostName config directive & some bugfixing | Rainer Gerhards | 2010-12-16 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect | |||||
| * | | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-12-16 | 1 | -2/+2 | |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: runtime/parser.c | |||||
| * | | | | preparing for 4.7.3 | Rainer Gerhards | 2010-11-25 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | doc/imfile: fixed small but important typo | Rainer Gerhards | 2010-10-20 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -2/+2 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2010-12-16 | 1 | -2/+2 | |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c |