Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | upgraded omlibdbi to support the new v6 config format | Rainer Gerhards | 2012-02-02 | 1 | -22/+34 |
| | |||||
* | ommysql: updated doc | Rainer Gerhards | 2012-02-02 | 1 | -16/+30 |
| | |||||
* | preparing for 6.3.7 | Rainer Gerhards | 2012-01-31 | 1 | -1/+1 |
| | |||||
* | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 3 | -1/+9 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c | ||||
| * | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0 | Rainer Gerhards | 2012-01-16 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | The new default turns off rate limiting. This was chosen as people experienced problems with rate-limiting activated by default. Now it needs an explicit opt-in by setting this parameter. Thanks to Chris Gaffney for suggesting to make it opt-in; thanks to many unnamed others who already had complained at the time Chris made the suggestion ;-) | ||||
| * | Merge branch 'v4-stable-tmp' into v5-devel-tmp | Rainer Gerhards | 2012-01-10 | 2 | -0/+5 |
| |\ | | | | | | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c | ||||
| | * | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c | ||||
| | | * | added $SpaceLFOnReceive config directive | Tomas Heinrich | 2012-01-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+4 |
| | |\| | |||||
| | | * | added canned template for ultra-exact sysklogd file format | Tomas Heinrich | 2012-01-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | the point is that LF will be translated to SP Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | finally cleaning up the syslog-ng rsyslog comparison | Rainer Gerhards | 2012-01-09 | 1 | -112/+123 |
| | | | | | | | | | | | | | | | | | | | | this page should be removed from the doc set over time -- it really does not belong here. | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-01-09 | 4 | -43/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v6compatibility.html | ||||
| * | | | | removing $Begin, $End, $StrictScoping directives | Rainer Gerhards | 2012-01-09 | 4 | -43/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. ------------------------- | ||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-19 | 1 | -1/+3 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c | ||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 4 | -4/+49 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c | ||||
| | * | | | | added instrumentation | Rainer Gerhards | 2011-12-19 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | more work on queue statistics counter | Rainer Gerhards | 2011-12-16 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-16 | 1 | -5/+23 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c | ||||
| * | | | | | preparing for 5.9.4v5.9.4 | Rainer Gerhards | 2011-11-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | imuxsock: added capability to "annotate" messages with "trusted information", | Rainer Gerhards | 2011-11-29 | 1 | -5/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which contains some properties obtained from the system and as such sure to not be faked. This is inspired by the similiar idea introduced in systemd. | ||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | added doc for omprog | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
| | | | | | | |||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-12-12 | 2 | -4/+5 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-01 | 1 | -3/+2 |
| |\| | | | | |||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| | |\| | | | |||||
| | | * | | | doc bugfix: typo in imgssapi doc | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| |\| | | | | |||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| | |\| | | | |||||
| | | * | | | doc: imfile: clarified that empty lines are not processed | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-27 | 3 | -29/+59 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html | ||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 1 | -2/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html | ||||
| * | | | | | | bugfix (kind of): removed numerical part from pri-text | Rainer Gerhards | 2011-10-21 | 2 | -25/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | see v6 compatibility document for reasons | ||||
* | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-10-21 | 2 | -5/+5 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-21 | 2 | -5/+5 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| | * | | | | | preparing for 5.8.6 releasev5.8.6 | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-20 | 2 | -5/+5 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | doc bugfix: pri-text neees to be fixed in an article as well | Rainer Gerhards | 2011-10-20 | 1 | -3/+3 |
| | | | | | | |||||
| | | * | | | doc bug: property pri-text was incorrectly described | Rainer Gerhards | 2011-10-20 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | 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 | ||||
* | \ \ \ \ \ | Merge branch 'beta' | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | 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 |
| | | | | | | | |