Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -1/+7 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh | ||||
| * | preparing for 5.7.8 releasev5.7.8 | Rainer Gerhards | 2011-03-09 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -1/+7 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c | ||||
| | * | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -1/+7 |
| | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 | ||||
| | * | preparing for 5.6.4v5.6.4 | Rainer Gerhards | 2011-03-02 | 1 | -1/+1 |
| | | | |||||
| | * | preparing for v5.6.3v5.6.3 | Rainer Gerhards | 2011-01-26 | 1 | -1/+1 |
| | | | |||||
| * | | preparing for 5.7.7v5.7.7 | Rainer Gerhards | 2011-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | preparing for 5.7.6v5.7.6 | Rainer Gerhards | 2011-02-25 | 1 | -1/+1 |
| | | | |||||
| * | | preparing for 5.7.5 release | Rainer Gerhards | 2011-02-23 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -1/+4 |
|\| | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c | ||||
| * | | enhance: imfile did not yet support multiple rulesets, now added | Rainer Gerhards | 2011-02-18 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | we do this directly in the beta because a) it does not affect existing functionality and b) one may argue that this missing functionality is close to a bug. | ||||
| * | | preparing for 5.7.4 releasev5.7.4 | Rainer Gerhards | 2011-02-17 | 1 | -1/+1 |
| | | | |||||
* | | | preparing for 6.1.4 releasev6.1.4 | Rainer Gerhards | 2011-02-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-11 | 1 | -1/+0 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | preparing for 5.7.3v5.7.3 | Rainer Gerhards | 2011-02-04 | 1 | -1/+1 |
| | | | |||||
| * | | removed invalid link from doc | Rainer Gerhards | 2011-02-04 | 1 | -1/+0 |
| | | | |||||
* | | | preparing for 6.1.3v6.1.3 | Rainer Gerhards | 2011-02-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-02-01 | 2 | -0/+17 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/imudp/imudp.c plugins/ommysql/ommysql.c | ||||
| * | | added doc for new ommysql directives | Ariel P | 2011-02-01 | 1 | -0/+12 |
| | | | |||||
| * | | enhanced imfile to support multi-line messages | David Lang | 2011-01-25 | 1 | -0/+5 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | cleanup of imptcp; doc added; config statement for workers added | Rainer Gerhards | 2011-01-31 | 1 | -0/+5 |
| | | | |||||
* | | | doc: minor typo fix | Rainer Gerhards | 2010-12-17 | 1 | -1/+1 |
| | | | |||||
* | | | added minimal doc for new imudp config statements | Rainer Gerhards | 2010-12-17 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 2 | -2/+8 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c | ||||
| * | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -0/+6 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c | ||||
| | * | | added $LocalHostName config directive & some bugfixing | Rainer Gerhards | 2010-12-16 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect | ||||
| | * | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-12-16 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c | ||||
| | * | | | preparing for 4.7.3 | Rainer Gerhards | 2010-11-25 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | doc/imfile: fixed small but important typo | Rainer Gerhards | 2010-10-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2010-12-16 | 1 | -2/+2 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c | ||||
| | | * | | typo fix (thanks to Björn Påhlsson for finding it!) | Michael Biebl | 2010-11-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | | preparing for 5.6.2v5.6.2 | Rainer Gerhards | 2010-11-30 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | preparing for 6.1.2 releasev6.1.2 | Rainer Gerhards | 2010-12-16 | 3 | -1/+58 |
| | | | | | |||||
* | | | | | Merge branch 'lognorm' + some doc added | Rainer Gerhards | 2010-12-13 | 3 | -2/+65 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | milestone: added support for CEE-variables to RainerScript | Rainer Gerhards | 2010-12-03 | 1 | -1/+52 |
| | | | | | | |||||
| * | | | | | milestone: added support for CEE-properties in property-based filters | Rainer Gerhards | 2010-12-01 | 1 | -0/+7 |
|/ / / / / | |||||
* | | | | | Merge branch 'v5-devel'v6.1.1 | Rainer Gerhards | 2010-11-30 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | bumped version to 5.7.2v5.7.2 | Rainer Gerhards | 2010-11-30 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-11-25 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | | | | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2010-11-25 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html plugins/imfile/imfile.c runtime/rsyslog.h | ||||
| | * | | | Merge branch 'v5.6.0a' into v5-stable | Rainer Gerhards | 2010-11-25 | 1 | -0/+10 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | | | imfile improvements | Rainer Gerhards | 2010-10-27 | 1 | -0/+10 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures) | ||||
| | * | | | preparing for 5.6.0 | Rainer Gerhards | 2010-10-22 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-20 | 1 | -0/+10 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c | ||||
| * | | | | Merge branch 'v4-devel' into v5-devel | root | 2010-10-20 | 1 | -0/+10 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | imfile improvements | Rainer Gerhards | 2010-10-24 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures) | ||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-15 | 2 | -3/+20 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2010-10-15 | 1 | -1/+11 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am plugins/imfile/imfile.c runtime/stream.c tests/tcpflood.c |