Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | preparing for version 5.2.0v5.2.0 | Rainer Gerhards | 2009-11-02 | 1 | -1/+1 |
| | |||||
* | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2009-09-29 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | bumped version number | Rainer Gerhards | 2009-09-22 | 1 | -1/+1 |
| | | |||||
| * | preparing for 4.5.3v4.5.3 | Rainer Gerhards | 2009-09-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2009-09-14 | 1 | -2/+2 |
|\| | |||||
| * | fixed some minor portability issues | Rainer Gerhards | 2009-09-14 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-08-27 | 1 | -0/+11 |
| |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/msg.c | ||||
* | | | preparing for 5.1.5 releasev5.1.5 | Rainer Gerhards | 2009-09-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2009-08-26 | 1 | -0/+11 |
|\ \ \ | |||||
| * \ \ | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2009-08-25 | 1 | -0/+11 |
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | Conflicts: ChangeLog runtime/msg.c | ||||
| | * | features requiring Java are automatically disabled if Java is not present | Rainer Gerhards | 2009-08-25 | 1 | -0/+11 |
| | | | | | | | | | | | | (thanks to Michael Biebl for his help!) | ||||
| | * | Merge branch 'v4.3.2' (v4-beta) into v4-stablev4.4.0 | Rainer Gerhards | 2009-08-21 | 1 | -56/+156 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am | ||||
| | * \ | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-07-13 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | preparing for 4.5.2v4.5.2 | Rainer Gerhards | 2009-08-21 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | preparing for 5.1.4 releasev5.1.4 | Rainer Gerhards | 2009-08-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2009-07-16 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/wti.c runtime/wtp.c | ||||
| * | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-07-16 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | calls to prctl() need to be based on configure results (cross-platform issue) | Rainer Gerhards | 2009-07-16 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2009-07-15 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | final touches for 4.5.1v4.5.1 | Rainer Gerhards | 2009-07-15 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2009-07-13 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Merge branch 'v3-stable' into v4-beta | Rainer Gerhards | 2009-07-13 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | better configure error message if mysql-devel is missing | Rainer Gerhards | 2009-07-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | preparing for 3.22.1v3.22.1 | Rainer Gerhards | 2009-07-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | updating version info to 4.5.0 | Rainer Gerhards | 2009-07-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | moved udp spoofing code to its own output module (omudpspoof) | Rainer Gerhards | 2009-07-09 | 1 | -23/+33 |
| | | | | | |||||
* | | | | | made udp spoofing code compile (but does not necessarily run right now, ↵ | Rainer Gerhards | 2009-07-09 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | untested) | ||||
* | | | | | finishing touches for 5.1.2v5.1.2 | Rainer Gerhards | 2009-07-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into v5-devel | Rainer Gerhards | 2009-06-24 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMPORTANT: this merge did NOT include the (important) changes to action.c . Consolidating them was too hard (aka "error-prone") because of the large differences in the code base. The fixes will be redone with a later commit. Conflicts: action.c configure.ac doc/manual.html | ||||
| * | | | | Merge branch 'omfile' | Rainer Gerhards | 2009-06-24 | 1 | -1/+2 |
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | Merge branch 'v4-stable' into beta | Rainer Gerhards | 2009-06-24 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | preparing for v4-stable | Rainer Gerhards | 2009-06-22 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'omfile' into v5-devel | Rainer Gerhards | 2009-06-22 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | reduced memory footprint / "memory leak" | Rainer Gerhards | 2009-06-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing has shown that at least the glibc malloc() subsystem returns memory to the OS far too late in our case. So we need to help it a bit, by calling malloc_trim(), which will tell the alloc subsystem to consolidate and return to the OS. | ||||
* | | | | | Merge branch 'omfile' into v5-devel | Rainer Gerhards | 2009-06-16 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this was NOT a trivial merge, and there may be some issues. This needs to be seen when we continue developing. Conflicts: runtime/msg.h runtime/obj.h runtime/queue.c runtime/srUtils.h runtime/stream.c runtime/stream.h runtime/wti.c tests/Makefile.am tools/omfile.c tools/syslogd.c | ||||
| * | | | | first proof of concept on zipped file writer | Rainer Gerhards | 2009-06-03 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | This DOES NOT work sufficiently well, I just wanted to verify that zip writing is possible and files are readable. Will be refined soon. | ||||
* | | | | Merge branch 'master' into v5-devel | Rainer Gerhards | 2009-06-04 | 1 | -0/+31 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | | added config switch --enable-testbench=no to turn off testbench | Rainer Gerhards | 2009-06-03 | 1 | -0/+15 |
| | | | | |||||
| * | | | added support for custom modules | Rainer Gerhards | 2009-06-02 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | ... this provides some basic support to integrate extensions that are not direct parts of rsyslog to be built during its build process. | ||||
* | | | | preparing for 5.1.0 releasev5.1.0 | Rainer Gerhards | 2009-05-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into v5-devel | Rainer Gerhards | 2009-05-28 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| * | | | Merge branch 'beta' into master | Rainer Gerhards | 2009-05-28 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | * | | Merge branch 'v3-stable' into beta | Rainer Gerhards | 2009-05-28 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | | * | relaxed GnuTLS version requirement to 1.4.0 | Rainer Gerhards | 2009-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after confirmation from the field that this version is sufficient. I always thought so (I think I developed under 1.4.x), but had no longer an environment to verify. Most imporantly, this means that Centos users will have much less trouble building rsyslog/tls support. | ||||
| | | * | preparing for 3.22.0 (move to stable)v3.22.0 | Rainer Gerhards | 2009-04-21 | 1 | -1/+1 |
| | | | | |||||
| | * | | preparing for 4.1.7v4.1.7 | Rainer Gerhards | 2009-04-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | fixing an issue during DA mode queue shutdown | Rainer Gerhards | 2009-05-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | also changed DA queue mode in that the regular workers now run concurrently. | ||||
* | | | | begun rsyslog v5 branch (for ultra-reliable queue) | Rainer Gerhards | 2009-05-28 | 1 | -1/+1 |
|/ / / | |||||
* | | | preparing for 4.3.1v4.3.1 | Rainer Gerhards | 2009-05-25 | 1 | -1/+1 |
| | | | |||||
* | | | Cleanup configure.ac a little for better readability | Michael Biebl | 2009-05-19 | 1 | -32/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Use 2 new lines as separator between configure options. - Remove forgotten copy&paste text. - Reorder and move template configure option to the end. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> |