Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | preparing for 6.1.8 releasev6.1.8 | Rainer Gerhards | 2011-05-21 | 1 | -1/+1 |
| | |||||
* | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-20 | 1 | -0/+15 |
|\ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c | ||||
| * | preparing for 5.8.1 stablev5.8.1 | Rainer Gerhards | 2011-05-19 | 1 | -1/+1 |
| | | |||||
| * | added skeleton for mmsnmptrapd | Rainer Gerhards | 2011-05-05 | 1 | -0/+17 |
| | | |||||
| * | Merge branch 'v5-beta' into v5-stable | Rainer Gerhards | 2011-04-12 | 1 | -22/+204 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | plus bump to new v5-stable Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | preparing for 5.6.5v5.6.5 | Rainer Gerhards | 2011-03-22 | 1 | -1/+1 |
| | | | |||||
| * | | preparing for 5.6.4v5.6.4 | Rainer Gerhards | 2011-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | bug: configure needs a check for more recent liblognorm | Rainer Gerhards | 2011-04-18 | 1 | -1/+1 |
| | | | |||||
* | | | preparing for 6.1.7v6.1.7 | Rainer Gerhards | 2011-04-15 | 1 | -1/+1 |
| | | | |||||
* | | | added log classification capabilities (via mmnormalize & tags) | Rainer Gerhards | 2011-04-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -0/+18 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| * | | preparing for 5.7.10 | Rainer Gerhards | 2011-03-29 | 1 | -1/+1 |
| | | | |||||
| * | | prepared skeleton for new strgen module | Rainer Gerhards | 2011-03-17 | 1 | -0/+18 |
| | | | |||||
| * | | preparing for 5.7.9v5.7.9 | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
| | | | |||||
* | | | preparing for 6.1.6v6.1.6 | Rainer Gerhards | 2011-03-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -0/+22 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh | ||||
| * | | added MySQL life tests for ommysql | Rainer Gerhards | 2011-03-09 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | tests run against a life database instance which must be setup in a specific way. | ||||
| * | | preparing for 5.7.8 releasev5.7.8 | Rainer Gerhards | 2011-03-09 | 1 | -1/+1 |
| | | | |||||
| * | | testbench: valgrind tests only executed if valgrind is available | Rainer Gerhards | 2011-03-09 | 1 | -0/+4 |
| | | | |||||
| * | | preparing for 5.7.7v5.7.7 | Rainer Gerhards | 2011-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into master-tcpsrv-mt | Rainer Gerhards | 2011-02-28 | 1 | -10/+100 |
|\ \ \ | |||||
| * | | | 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 |
| | | | | |||||
| * | | | preparing for 6.1.4 releasev6.1.4 | Rainer Gerhards | 2011-02-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -5/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c | ||||
| | * | | Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta | Rainer Gerhards | 2011-02-17 | 1 | -5/+0 |
| | |\ \ | |||||
| | | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-02-17 | 1 | -5/+0 |
| | | |\| | |||||
| | | | * | bugfix: testbench was not activated if no Java was present on system | Rainer Gerhards | 2011-02-17 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | ... what actually was a left-over. Java is no longer required. | ||||
| | | | * | preparing for v5.6.3v5.6.3 | Rainer Gerhards | 2011-01-26 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | preparing for 5.7.4 releasev5.7.4 | Rainer Gerhards | 2011-02-17 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-11 | 1 | -5/+20 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | fixed invalid help strings in configure.ac | Rainer Gerhards | 2011-02-08 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | Thanks to Michael Biebl for mentioning this problem! | ||||
| | * | | added pmsnare parser module | David Lang | 2011-02-08 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | preparing for 5.7.3v5.7.3 | Rainer Gerhards | 2011-02-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | preparing for 6.1.3v6.1.3 | Rainer Gerhards | 2011-02-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-02-01 | 1 | -0/+60 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/imudp/imudp.c plugins/ommysql/ommysql.c | ||||
| | * | | added pmaixforwardedfrom message parser | David Lang | 2011-02-01 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | integrated pmciscomsg into the build system | Rainer Gerhards | 2011-01-13 | 1 | -0/+15 |
| | | | | |||||
| | * | | Merge branch 'v5.6.2-newimudp' into v5-devel-newimudp | Rainer Gerhards | 2011-01-10 | 1 | -0/+30 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imudp/imudp.c threads.c | ||||
| | | * | | improved imudp real-time scheduling support & bugfix | Dražen Kačar | 2011-01-10 | 1 | -0/+30 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | The original code had quite some issues, which are fixed by this commit. Also we do more error checking now. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | | * | preparing for 5.6.2v5.6.2 | Rainer Gerhards | 2010-11-30 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2010-11-24 | 1 | -1/+1 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | | * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2010-11-24 | 1 | -1/+1 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | | | | * | bugfix(important): problem in TLS handling could cause rsyslog to loopv3.22.3 | Rainer Gerhards | 2010-11-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in a tight loop, effectively disabling functionality and bearing the risk of unresponsiveness of the whole system. Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194 | ||||
| | | | | * | preparing for 3.22.2v3.22.2 | Rainer Gerhards | 2010-08-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | experimental support for monogodb added | Victor Pereira | 2011-01-31 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | | added support for TLS (in anon mode) to tcpflood | Rainer Gerhards | 2011-02-02 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | added first (very experimental) version of imttcp | Rainer Gerhards | 2011-01-24 | 1 | -0/+15 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 1 | -17/+35 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c |