summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-071-2/+2
| | | | Thanks to Jo Rhett for the suggestion.
* Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-072-0/+18
|\ | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-1/+1
| |\ | | | | | | | | | | | | Conflicts: configure.ac
| | * preparing for 5.8.10v5.8.10Rainer Gerhards2012-04-071-1/+1
| | |
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-1/+6
| |\| | | | | | | | | | | | | Conflicts: configure.ac
| | * doc: noted disk queue format change from v4->v5Rainer Gerhards2012-04-051-0/+5
| | |
| | * preparing for 5.8.9v5.8.9Rainer Gerhards2012-03-151-1/+1
| | |
| * | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-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-develRainer Gerhards2012-03-201-0/+6
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c
| * | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-201-0/+6
| | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-191-0/+6
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h
| * | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-191-0/+6
| | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-122-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 imklogRainer Gerhards2012-03-102-1/+6
| | |
| * | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-1/+6
| | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-051-1/+1
| |\| | | | | | | | | | | | | Conflicts: configure.ac
| | * preparing for 5.8.8v5.8.8Rainer Gerhards2012-03-051-1/+1
| | |
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-241-1/+1
| |\| | | | | | | | | | | | | Conflicts: configure.ac
| | * preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-171-1/+1
| | |
* | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-161-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-tmpRainer Gerhards2012-01-102-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c
| * \ \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
| | * | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+4
| |\| | |
| | * | | added canned template for ultra-exact sysklogd file formatTomas Heinrich2012-01-101-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-develRainer Gerhards2011-12-194-4/+49
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c
| * | | | added instrumentationRainer Gerhards2011-12-191-1/+3
| | |_|/ | |/| |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-162-0/+44
| |\| |
| | * | added doc for omprogRainer Gerhards2011-12-162-0/+44
| | | |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-11-031-3/+2
| |\| |
| | * | doc bugfix: typo in imgssapi docRainer Gerhards2011-11-031-3/+2
| | | |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-251-1/+3
| |\| |
| | * | doc: imfile: clarified that empty lines are not processedRainer Gerhards2011-10-251-1/+3
| | | |
* | | | more work on queue statistics counterRainer Gerhards2011-12-161-1/+3
| | | |
* | | | preparing for 5.9.4v5.9.4Rainer Gerhards2011-11-291-1/+1
| | | |
* | | | imuxsock: added capability to "annotate" messages with "trusted information",Rainer Gerhards2011-11-291-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-develRainer Gerhards2011-10-212-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * | | preparing for 5.8.6 releasev5.8.6Rainer Gerhards2011-10-211-1/+1
| | | |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-202-5/+5
| |\| |
| | * | doc bugfix: pri-text neees to be fixed in an article as wellRainer Gerhards2011-10-201-3/+3
| | | |
| | * | doc bug: property pri-text was incorrectly describedRainer Gerhards2011-10-201-2/+2
| | | |
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-171-0/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-171-0/+2
| |\| |
| | * | doc: clarified that imklog does not support SolarisRainer Gerhards2011-10-171-0/+2
| | | |
| | * | Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0Rainer Gerhards2011-09-0714-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.5Rainer Gerhards2011-08-311-1/+1
| | | | |
| | | * | preparing for 4.7.4v4.7.4Rainer Gerhards2011-07-111-1/+1
| | | | |
| | | * | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-0/+19
| | | | |
| | | * | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-114-10/+17
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-091-0/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c