| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 2 | -10/+19 |
| |\ | |||||
| | * | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -0/+9 |
| | | | |||||
| | * | doc: correcting sample section of omudpspoof | Rainer Gerhards | 2012-04-20 | 1 | -8/+8 |
| | | | | | | | | | again, credits to Jo Rhett for reporting this issue | ||||
| | * | doc: omudpspoof doc had invalid directives | Rainer Gerhards | 2012-04-20 | 1 | -2/+2 |
| | | | | | | | | | Thanks to Jo Rhett for reporting the bug. | ||||
| * | | preparing for 5.9.6v5.9.6 | Rainer Gerhards | 2012-04-12 | 2 | -6/+9 |
| | | | |||||
| * | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 2 | -9/+1 |
| |\ \ | |||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 2 | -9/+1 |
| | |\| | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c | ||||
| | | * | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 2 | -9/+1 |
| | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug. | ||||
| * | | | permit size modifiers (k,m,g,...) in integer config parameters | Rainer Gerhards | 2012-04-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion. | ||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 2 | -0/+18 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | preparing for 5.8.10v5.8.10 | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 2 | -1/+6 |
| | |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | doc: noted disk queue format change from v4->v5 | Rainer Gerhards | 2012-04-05 | 1 | -0/+5 |
| | | | | |||||
| | | * | preparing for 5.8.9v5.8.9 | Rainer Gerhards | 2012-03-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step... | ||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-20 | 1 | -0/+6 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c | ||||
| | * | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-20 | 1 | -0/+6 |
| | | | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming | ||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-19 | 1 | -0/+6 |
| |\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h | ||||
| | * | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-19 | 1 | -0/+6 |
| | | | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming | ||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 2 | -2/+14 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c | ||||
| | * | | added capability to use a local interface IP address as fromhost-ip for imklog | Rainer Gerhards | 2012-03-10 | 2 | -1/+6 |
| | | | | |||||
| | * | | added capability to use a local interface IP address as fromhost-ip for imuxsock | Rainer Gerhards | 2012-03-06 | 1 | -1/+6 |
| | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF | ||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-05 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | preparing for 5.8.8v5.8.8 | Rainer Gerhards | 2012-03-05 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-24 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | preparing for 5.8.7v5.8.7 | Rainer Gerhards | 2012-01-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | $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> | ||||
| * | | | | | 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 |
| | | |_|/ | |/| | | |||||
| | * | | | 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 '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 '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 |
| | | | | | |||||
| * | | | | more work on queue statistics counter | Rainer Gerhards | 2011-12-16 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | 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 '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 | ||||
 |
index : rsyslog.git | |
| rsyslog development for Lumberjack - various unofficial and potentially rebased branches | Miloslav Trmac |
| summaryrefslogtreecommitdiffstats |