Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 | |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 | |
| |\| | | ||||||
| | * | | doc: clarified that imklog does not support Solaris | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0 | Rainer Gerhards | 2011-09-07 | 14 | -22/+348 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no changes compared to 4.7.5, just a re-release with the new version number as new v4-stable. The most important new feature is Solaris support. Conflicts: configure.ac doc/manual.html | |||||
| | | * | | preparing for 4.7.5 releasev4.7.5 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | preparing for 4.7.4v4.7.4 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | issue a warning message for old-style dynafile action | Rainer Gerhards | 2011-07-11 | 1 | -0/+19 | |
| | | | | | ||||||
| | | * | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-07-11 | 4 | -10/+17 | |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| | | * \ \ | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-09 | 1 | -0/+1 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c | |||||
| | * | | | | | preparing for 4.6.8 releasev4.6.8 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 | |
| | | |_|/ / | | |/| | | | ||||||
| * | | | | | preparing for 5.8.5 releasev5.8.5 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | preparing for 5.9.3 releasev5.9.3 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-16 | 1 | -2/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | |||||
| * | | | | | minor doc: made body tag parsable for web site scripts | Rainer Gerhards | 2011-08-12 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | preparing for version 5.8.4v5.8.4 | root | 2011-08-10 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | 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 | |||||
| * | | | | | 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 | |
| | | | | | | ||||||
| * | | | | | preparing for 5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | preparing for 5.9.1 releasev5.9.1 | Rainer Gerhards | 2011-06-30 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | 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 | |||||
| * | | | | | 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> |