Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v4-devel' into master | Rainer Gerhards | 2010-04-19 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html runtime/debug.c runtime/rsyslog.h tests/Makefile.am tests/diag.sh tests/nettester.c tools/syslogd.c | ||||
| * | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-04-12 | 1 | -2/+2 |
| |\ | |||||
| | * | doc bugfix: $OMFileFlushOnTXEnd wrongly documented | Rainer Gerhards | 2010-04-07 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'v4-stable-solaris' into v4-devel | Rainer Gerhards | 2010-04-12 | 9 | -12/+381 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/omfile.c tools/syslogd.c | ||||
| * | | Merge branch 'v4-beta' into tmp | Rainer Gerhards | 2010-01-26 | 2 | -9/+5 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
* | | | | updating project status | Rainer Gerhards | 2010-04-14 | 1 | -5/+5 |
| | | | | |||||
* | | | | updating project status | Rainer Gerhards | 2010-04-12 | 1 | -7/+7 |
| | | | | |||||
* | | | | preparing for 5.5.3 releasev5.5.3 | Rainer Gerhards | 2010-04-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'beta' into master | Rainer Gerhards | 2010-04-09 | 2 | -4/+19 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imudp/imudp.c runtime/stream.h tests/Makefile.am tests/diag.sh tools/omfile.c | ||||
| * \ \ \ | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2010-03-29 | 2 | -4/+19 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/debug.c runtime/stream.c tests/Makefile.am tests/diskqueue.sh tests/nettester.c tools/omfile.c | ||||
| | * | | | preparing for 4.6.2v4.6.2 | Rainer Gerhards | 2010-03-26 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | new feature: $OMFileAsyncWriting directive added | Rainer Gerhards | 2010-03-25 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | it permits to specifiy if asynchronous writing should be done or not | ||||
| | * | | | new feature: "." action type added to support writing files to relative pathes | Rainer Gerhards | 2010-03-17 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | (this is primarily meant as a debug aid) | ||||
| | * | | | retain old $OMFileFlushOnTXEnd semantics | Rainer Gerhards | 2010-03-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | required because due to bug the default was actually different than specified (or better said: spec was inconsistent in doc as well). | ||||
* | | | | | Merge branch 'v5-stable' | Rainer Gerhards | 2010-03-09 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/property_replacer.html runtime/datetime.h | ||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2010-03-09 | 1 | -0/+13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/datetime.h | ||||
| | * | | | added new property replacer option "date-rfc3164-buggyday" | Rainer Gerhards | 2010-03-08 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | primarily to ease migration from syslog-ng. See property replacer doc for details. [backport from 5.5.3 because urgently needed by some] | ||||
| | * | | | prepared 4.6.1v4.6.1 | Rainer Gerhards | 2010-03-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | preparing for 5.4.0v5.4.0 | Rainer Gerhards | 2010-03-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v4-stable' into 'v5-beta' | Rainer Gerhards | 2010-02-25 | 2 | -7/+10 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c | ||||
| | * | | | preparing for 4.6.0 releasev4.6.0 | Rainer Gerhards | 2010-02-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | updated project status | Rainer Gerhards | 2010-03-08 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | updated project status | Rainer Gerhards | 2010-03-05 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | added new property replacer option "date-rfc3164-buggyday" | Rainer Gerhards | 2010-03-05 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | primarily to ease migration from syslog-ng. See property replacer doc for details. | ||||
* | | | | | added capability to turn off standard LF delimiter in TCP server | Rainer Gerhards | 2010-03-01 | 1 | -10/+18 |
| | | | | | | | | | | | | | | | | | | | | via new directive "$InputTCPServerDisableLFDelimiter on" | ||||
* | | | | | updated project status | Rainer Gerhards | 2010-02-25 | 1 | -10/+6 |
| | | | | | |||||
* | | | | | Merge branch 'v4-beta' into master | Rainer Gerhards | 2010-02-24 | 2 | -7/+10 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: doc/manual.html tools/syslogd.c | ||||
| * | | | | doc update: added link to "rsyslog cookbook" | Rainer Gerhards | 2010-02-23 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | updated rsyslog/php-syslog-ng doc, now that phpLogCon has evolved so much | Rainer Gerhards | 2010-02-17 | 1 | -7/+9 |
| | | | | | |||||
* | | | | | Merge branch 'beta' into master | Rainer Gerhards | 2010-02-10 | 5 | -1/+339 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/parsertest.sh | ||||
| * | | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-02-10 | 5 | -1/+339 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c template.c tests/Makefile.am tests/parsertest.sh | ||||
| | * | | | preparing for 4.5.8v4.5.8 | Rainer Gerhards | 2010-02-10 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | minor doc fix: wrong default | Rainer Gerhards | 2010-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | ... that clearly showed I could not do my math ;) | ||||
| | * | | | integrated new PostgreSQL doc | Rainer Gerhards | 2010-02-08 | 4 | -0/+338 |
| | | | | | | | | | | | | | | | | | | | | converted to html, linked, etc... | ||||
| | * | | | improved PostgreSQL database create script, provided doc on PostgreSQL setup | Marc Schiffbauer | 2010-02-08 | 1 | -0/+0 |
| | | |/ | | |/| | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | preparing for 5.3.7v5.3.7 | Rainer Gerhards | 2010-01-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | updated project status | Rainer Gerhards | 2010-02-10 | 1 | -4/+4 |
| | | | | |||||
* | | | | updated project status | Rainer Gerhards | 2010-02-05 | 1 | -4/+4 |
| | | | | |||||
* | | | | preparing for 5.5.2v5.5.2 | Rainer Gerhards | 2010-02-05 | 2 | -2/+2 |
| | | | | |||||
* | | | | added some information on how to help troubleshoot rsyslog | Rainer Gerhards | 2010-01-28 | 2 | -3/+53 |
| | | | | |||||
* | | | | added $Escape8BitCharactersOnReceive directive | Rainer Gerhards | 2010-01-27 | 3 | -0/+46 |
| | | | | | | | | | | | | | | | | Thanks to David Lang for suggesting this functionality. | ||||
* | | | | updated project status information | Rainer Gerhards | 2010-01-27 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2010-01-19 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-01-19 | 1 | -2/+2 |
| |\| | | |||||
| | * | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2010-01-19 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | Fix a typo regarding syslog.h and syslog(3) | Michael Biebl | 2010-01-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | prepared for 5.3.6v5.3.6 | Rainer Gerhards | 2010-01-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | updating project status | Rainer Gerhards | 2010-01-13 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2010-01-12 | 2 | -7/+4 |
|\| | | | | |||||
| * | | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-01-12 | 1 | -7/+3 |
| |\| | | |