Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 1 | -1/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c | ||||
| * | preparing for 5.10.0 release | Rainer Gerhards | 2012-08-22 | 1 | -1/+3 |
| | | |||||
* | | Don't run valgrind tests if imdiag is not enabled | Miloslav Trmač | 2012-05-31 | 1 | -2/+2 |
| | | | | | | | | Valgrind tests depend on imdiag as well. | ||||
* | | bugfix: abort during startup when rsyslog.conf v6+ format was used in a ↵ | Rainer Gerhards | 2012-02-02 | 1 | -0/+3 |
| | | | | | | | | certain way | ||||
* | | Merge branch 'beta'v6.3.5 | Rainer Gerhards | 2011-08-31 | 1 | -15/+14 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html tests/Makefile.am | ||||
| * | | preparing for 6.1.12 releasev6.1.12 | Rainer Gerhards | 2011-08-31 | 1 | -14/+14 |
| | | | |||||
* | | | Merge branch 'master-newconf' | Rainer Gerhards | 2011-07-12 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/omfile.c | ||||
| * | | | cleaup & emergency config system reactivated | Rainer Gerhards | 2011-07-09 | 1 | -1/+2 |
| | | | | |||||
* | | | | preparing for 6.3.2v6.3.2 | Rainer Gerhards | 2011-07-06 | 1 | -8/+15 |
|/ / / | |||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2011-06-21 | 1 | -0/+11 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh | ||||
| * | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 1 | -1/+13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | ||||
| | * | preparing for 5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -1/+2 |
| | | | |||||
| | * | testbench: added new tests for failover cases | Rainer Gerhards | 2011-06-20 | 1 | -0/+11 |
| | | | |||||
| * | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-14 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/nsd_gtls.c tcpsrv.c tests/Makefile.am | ||||
| | * | backporting TLS-based test | Rainer Gerhards | 2011-06-14 | 1 | -0/+6 |
| | | | |||||
| | * | backported current tcpflood testing tool | Rainer Gerhards | 2011-06-14 | 1 | -1/+2 |
| | | | | | | | | | | | | so that we can improve v5's testbench as well | ||||
* | | | bugfix: memory leak in imtcp & subsystems under some circumstances | Rainer Gerhards | 2011-06-10 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | This leak is tied to error conditions which lead to incorrect cleanup of some data structures. | ||||
* | | | added some more tls-based tests to testbench | Rainer Gerhards | 2011-06-10 | 1 | -1/+6 |
| | | | |||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2011-05-21 | 1 | -0/+6 |
|\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imrelp/imrelp.c | ||||
| * | | preparing for 6.1.8 releasev6.1.8 | Rainer Gerhards | 2011-05-21 | 1 | -0/+6 |
| | | | |||||
* | | | temporarily changed testbench to cover ongoing config changes | Rainer Gerhards | 2011-04-26 | 1 | -1/+1 |
|/ / | |||||
* | | added one more testcase for sending TCP/TLS syslog | Rainer Gerhards | 2011-04-04 | 1 | -1/+5 |
| | | |||||
* | | activated TLS send/receive test in testbench | Rainer Gerhards | 2011-04-04 | 1 | -0/+4 |
| | | | | | | | | | | This was possible because in v6 we do no longer have the TLS startup delay. | ||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -2/+24 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| * | improved testbench, updated ChangeLog to reflect recent bugfix | Rainer Gerhards | 2011-03-31 | 1 | -2/+4 |
| | | | | | | | | | | | | After trying out some more things with the new code (after last bugfix), I now think that the bugfix is OK to use and without regressions. | ||||
| * | added some more valgrind-based tests | Rainer Gerhards | 2011-03-16 | 1 | -0/+8 |
| | | |||||
| * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -1/+13 |
| |\ | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | * | fixed a regression of last patch and some cleanup | Rainer Gerhards | 2011-03-16 | 1 | -0/+3 |
| | | | |||||
| | * | bugfix: failover did not work correctly if repeated msg reduction was on | Rainer Gerhards | 2011-03-16 | 1 | -0/+9 |
| | | | | | | | | | | | | affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on | ||||
* | | | testbench bugfix: tls test failed during make distcheck... | Rainer Gerhards | 2011-03-11 | 1 | -0/+4 |
| | | | | | | | | | | | | ... due to wrong path the certificate files | ||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -1/+14 |
|\| | | |||||
| * | | added one more test for imfile (under valgrind) | Rainer Gerhards | 2011-03-11 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-11 | 1 | -1/+10 |
| |\| | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-03-11 | 1 | -1/+10 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am tests/diag.sh tests/tcpflood.c | ||||
| | | * | added new test for imfile to testbench | Rainer Gerhards | 2011-03-11 | 1 | -1/+10 |
| | | | | |||||
* | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -3/+57 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh | ||||
| * | | | bugfix: minor memory leak in omlibdbi (< 1k per instance and run) | Rainer Gerhards | 2011-03-10 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | also testbench improvement (omlibdbi now also receives a couple of tests if we have a life MySQL server). | ||||
| * | | | fixed problem in testbench Makefile, added module to distcheck | Rainer Gerhards | 2011-03-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for mentioning that some modules were not included in make distcheck. | ||||
| * | | | fixed problems in testbench makefile (just introduced...) | Rainer Gerhards | 2011-03-09 | 1 | -4/+4 |
| | | | | |||||
| * | | | added MySQL life tests for ommysql | Rainer Gerhards | 2011-03-09 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | tests run against a life database instance which must be setup in a specific way. | ||||
| * | | | improved testbench | Rainer Gerhards | 2011-03-09 | 1 | -0/+5 |
| | | | | |||||
| * | | | make testbench not errout if imdiag is not enabled | Rainer Gerhards | 2011-03-09 | 1 | -4/+10 |
| | | | | |||||
| * | | | testbench: valgrind tests only executed if valgrind is available | Rainer Gerhards | 2011-03-09 | 1 | -2/+6 |
| | | | | |||||
| * | | | further improved testbench | Rainer Gerhards | 2011-03-08 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | some cosmetic issues, plus a new valgrind-based test | ||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -1/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c | ||||
| | * | | added new test to testbench | Rainer Gerhards | 2011-03-08 | 1 | -1/+4 |
| | | | | |||||
| * | | | added new test to check RepeatedMsgReduction (via TCP) | Rainer Gerhards | 2011-03-06 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is kind of a backport of a similar UDP-based test from v6. However, we do not have everything required for UDP in the v5 test tool base, so we mimic the test with tcp -- which is not bad at all, because the code path for TCP is somewhat different (and thus once we merge this patch into v6, it is a useful addition). | ||||
* | | | | added additional test for repeated message reduction (with valgrind) | Rainer Gerhards | 2011-03-06 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge branch 'master-tcpsrv-mt'v6.1.5 | Rainer Gerhards | 2011-03-04 | 1 | -1/+12 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | added new tls-based test to testbench | Rainer Gerhards | 2011-02-28 | 1 | -0/+7 |
| | | | | |