Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2009-12-04 | 2 | -0/+3 |
|\ | |||||
| * | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-12-04 | 2 | -0/+3 |
| |\ | |||||
| | * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-12-04 | 2 | -0/+3 |
| | |\ | |||||
| | | * | bugfix: potential segfault when -p command line option was used | Rainer Gerhards | 2009-12-04 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | thanks to varmojfekoj for pointing me at this bug | ||||
* | | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
|\| | | | |||||
| * | | | bugfix: hostname accidently set to IP address for some message sources | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | for example imudp. Thanks to Anton for reporting this bug. | ||||
| * | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
| |\| | | |||||
* | | | | cosmetic: mentioned imported patch in ChangeLog | Rainer Gerhards | 2009-11-30 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2009-11-30 | 6 | -28/+51 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_modules.html | ||||
| | * | | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | bugfix: $CreateDirs variable not properly initialized | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | default thus was random (but most often "on") | ||||
* | | | | | bugfix: commit transaction was not properly conveyed to message layer, | Rainer Gerhards | 2009-11-26 | 2 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | potentially resulting in non-message destruction and thus hangs | ||||
* | | | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2009-11-25 | 7 | -30/+58 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html tests/Makefile.am tests/sndrcv_drvr.sh | ||||
| * | | | | bugfix (kind of): check if TCP connection is still alive if using TLS | Jonathan Bond-Caron | 2009-11-25 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | preparing for 4.5.7v4.5.7 | Rainer Gerhards | 2009-11-18 | 5 | -3/+5 |
| | | | | | |||||
| * | | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-11-17 | 4 | -26/+48 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-11-17 | 4 | -26/+48 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf.html runtime/net.c | ||||
| | | * | | minor doc: enhanced description of loadable modules | Rainer Gerhards | 2009-11-17 | 1 | -17/+36 |
| | | | | | |||||
| | | * | | correcting -q/-Q patch - was invalid | Rainer Gerhards | 2009-11-12 | 3 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is the correct patch. The previous one solved the segfault, but disabled the -q/Q options. | ||||
* | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2009-11-25 | 2 | -0/+21 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am | ||||
| * | | | | bugfix: enabling GSSServer crashes rsyslog startup | Tomas Kubina | 2009-11-25 | 2 | -0/+6 |
| | | | | | |||||
| * | | | | cosmetic: added bugfix to changelog | Rainer Gerhards | 2009-11-12 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2009-11-12 | 3 | -4/+9 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2009-11-12 | 6 | -1/+56 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| * | | | | | preparing for version 5.2.0v5.2.0 | Rainer Gerhards | 2009-11-02 | 4 | -2/+51 |
| | | | | | | |||||
* | | | | | | bugfix: omfile output was only written when buffer was full | Rainer Gerhards | 2009-11-18 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | ... not at end of transaction. | ||||
* | | | | | | solved some minor nits in make distcheckv5.3.5 | Rainer Gerhards | 2009-11-13 | 3 | -1/+3 |
| | | | | | | |||||
* | | | | | | preparing for new beta (5.3.5) | Rainer Gerhards | 2009-11-13 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | Begin new beta branch | Rainer Gerhards | 2009-11-13 | 214 | -2656/+6278 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into beta Conflicts: ChangeLog tests/Makefile.am | ||||
| * | | | | | some light performance enhancement | Rainer Gerhards | 2009-11-12 | 13 | -20/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...by replacing time() call with much faster (at least under linux) gettimeofday() calls. | ||||
| * | | | | | Merge branch 'v4-devel' | Rainer Gerhards | 2009-11-12 | 2 | -11/+64 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'oracle' into v4-devel | Rainer Gerhards | 2009-11-12 | 2 | -11/+64 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Give even better output | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -9/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell which statement is failing, which element in the batch, and give its details. | ||||
| | | * | | | | | Improve the debug messages | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve traceability while testing. | ||||
| | | * | | | | | Debug output to find out a crash | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -1/+5 |
| | | | | | | | | |||||
| | | * | | | | | Report errors when OCI_SUCCESS_WITH_INFO happens | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -1/+29 |
| | | | | | | | | |||||
| | | * | | | | | Improve the handling of OCI_SUCCESS_WITH_INFO. | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop considering it as an error, and make it display the information from the Oracle server. | ||||
| | | * | | | | | doc | Luis Fernando Munoz Mejias | 2009-11-12 | 2 | -8/+9 |
| | | | | | | | | |||||
| | | * | | | | | If the server disconnects the handle is no longer valid and we need to | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call tryResume(), so we have to return RS_RET_SUSPENDED. Otherwise, we may keep losing messages until rsyslog is restarted. | ||||
| * | | | | | | | cosmetic: mentioned imported bugfix in changelog | Rainer Gerhards | 2009-11-12 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'v4-devel' | Rainer Gerhards | 2009-11-12 | 3 | -4/+9 |
| |\| | | | | | | |||||
| | * | | | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-12 | 3 | -4/+9 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-11-12 | 3 | -4/+9 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | | * | | | cosmetic: mention imported v3-bugfix in ChangeLog | Rainer Gerhards | 2009-11-12 | 1 | -0/+2 |
| | | | | | | | |||||
| | | | * | | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-11-12 | 3 | -4/+7 |
| | | | |\ \ \ | | | | | |/ / | | | | |/| / | | | | | |/ | |||||
| | | | | * | bugfix: segfault on startup when -q or -Q option was given | Rainer Gerhards | 2009-11-12 | 3 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=157 Thanks to Jonas Nogueira for reporting this bug. | ||||
| * | | | | | Merge branch 'v4-devel' | Rainer Gerhards | 2009-11-12 | 6 | -2/+58 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | * | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-12 | 6 | -1/+55 |
| | |\| | | | |||||
| | | * | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-11-12 | 6 | -1/+55 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am |