Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: clarified that pmlastmsg does not drop those messages | Rainer Gerhards | 2011-07-21 | 1 | -0/+5 |
| | |||||
* | preparing for 6.3.3v6.3.3 | Rainer Gerhards | 2011-07-13 | 2 | -1/+5 |
| | |||||
* | doc: v6 compatiblity doc added | Rainer Gerhards | 2011-07-13 | 2 | -27/+95 |
| | |||||
* | lexer bug: *.somewhat PRIs not detected | Rainer Gerhards | 2011-07-13 | 1 | -0/+30 |
| | | | | regression from last update | ||||
* | Merge branch 'v5-devel' | Rainer Gerhards | 2011-07-11 | 3 | -2/+21 |
|\ | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-11 | 3 | -2/+21 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| | * | preparing for 5.8.3v5.8.3 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | |||||
| | * | added warning message for old-style outchannel syntax | Rainer Gerhards | 2011-07-11 | 1 | -0/+19 |
| | | | |||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 2 | -2/+2 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh | ||||
| | | * | preparing for 4.6.7 releasev4.6.7 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | | |||||
| | | * | support for :omfile: forward compatibility directive | Rainer Gerhards | 2011-07-11 | 2 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-06 | 2 | -8/+14 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| * | | | preparing for 5.9.1 releasev5.9.1 | Rainer Gerhards | 2011-06-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | preparing for 6.3.2v6.3.2 | Rainer Gerhards | 2011-07-06 | 1 | -9/+1 |
| | | | | |||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2011-07-06 | 2 | -7/+21 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * \ \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-06 | 2 | -7/+17 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 2 | -8/+14 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | | added support for the ":omusrmsg:" syntax in configuring user messages | Rainer Gerhards | 2011-07-06 | 1 | -7/+13 |
| | | | | | |||||
| | | * | | preparing for 4.6.6v4.6.6 | Rainer Gerhards | 2011-06-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | prepare for 6.1.10v6.1.10 | Rainer Gerhards | 2011-06-22 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-06-27 | 5 | -7/+48 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c | ||||
| * | | | | added support for obtaining timestamp from system for imuxsock | Rainer Gerhards | 2011-06-20 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This permits to read the time a message was submitted to the system log socket. Most importantly, this is provided in microsecond resolution. So we are able to obtain high precision timestampis even for messages that were - as is usual - not formatted with them. This also simplifies things in regard to local time calculation in chroot environments. Many thanks to Lennart Poettering for suggesting this feature, providing some guidance on implementing it and coordinating getting the necessary support into the Linux kernel. | ||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-16 | 1 | -1/+15 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | | | | | 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 |
| | | | | | | | |||||
| * | | | | | | 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 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | 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 | ||||
* | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-06-21 | 1 | -1/+15 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+15 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | ||||
| | * | | | | | | preparing for 5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | 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 6.1.9 releasev6.1.9 | Rainer Gerhards | 2011-06-14 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | preparing for 6.3.1 releasev6.3.1 | Rainer Gerhards | 2011-06-09 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | preparing for 6.3.0v6.3.0 | Rainer Gerhards | 2011-06-01 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-05-21 | 4 | -4/+103 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imrelp/imrelp.c | ||||
| * | | | | | preparing for 6.1.8 releasev6.1.8 | Rainer Gerhards | 2011-05-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-20 | 3 | -3/+102 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c | ||||
| | * | | | | preparing for 5.8.1 stablev5.8.1 | Rainer Gerhards | 2011-05-19 | 1 | -1/+1 |
| | | |_|/ | | |/| | | |||||
| | * | | | mmsnmptrapd: added doc & mentioned in ChangeLog | Rainer Gerhards | 2011-05-10 | 3 | -0/+102 |
| | | | | | |||||
* | | | | | step: conf interface now natively supports priv drop | Rainer Gerhards | 2011-05-06 | 1 | -2/+72 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-26 | 1 | -1/+4 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | Conflicts: tools/omfile.c | ||||
| * | | | 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...). | ||||
* | | | | preparing for 6.1.7v6.1.7 | Rainer Gerhards | 2011-04-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-15 | 2 | -5/+6 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c |