| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-22 | 1 | -12/+20 |
| |\ | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | typo correction | Rainer Gerhards | 2012-11-22 | 1 | -5/+5 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-22 | 1 | -3/+35 |
| |\| | | | | | | | | | | | | | | | | | | | Note: this was not a simple merge, I rather needed to adopt the v5 code to the new v6 config handling. However, no v6 config format has been added yet (this is the next step). Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | * | bugfix: imklog mistakenly took kernel timestamp subseconds as nanoseconds | Rainer Gerhards | 2012-11-22 | 1 | -0/+15 |
| | | | | | | | | | | | | | ... actually, they are microseconds. So the fractional part of the timestamp was not properly formatted. Thanks to Marius Tomaschwesky for the bug report and the patch idea. | ||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-13 | 1 | -0/+4 |
| |\| | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | add "EAGAIN" patch to ChangeLog | Rainer Gerhards | 2012-11-13 | 1 | -0/+4 |
| | | | |||||
| * | | bugfix: $IncludeConfig did not correctly process directories | Rainer Gerhards | 2012-11-09 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=376 The testbench was also enhanced to check for these cases. Thanks to Georgi Georgiev for the bug report. Also minor bugfix: no error msg on unreadable $IncludeConfig path | ||||
| * | | bugfix: no error msg on invalid field option in legacy/string template | Rainer Gerhards | 2012-11-08 | 1 | -0/+1 |
| | | | |||||
| * | | doc: add recent patch (API) to ChangeLog | Rainer Gerhards | 2012-11-01 | 1 | -0/+3 |
| | | | |||||
| * | | bugfix: misaddressing of $mmnormalizeuserawmsg parameter | Rainer Gerhards | 2012-11-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | On many platforms, this has no effect at all. At some, it may cause a segfault. The problem occurs only during config phase, no segfault happens when rsyslog has fully started. | ||||
| * | | bugfix: build problems on some platforms | Rainer Gerhards | 2012-10-26 | 1 | -0/+3 |
| | | | |||||
| * | | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 1 | -2/+5 |
| | | | |||||
| * | | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 1 | -3/+7 |
| |\| | | |||||
| | * | | doc: reflect recent (v5-imported) fix in ChangeLog | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-17 | 1 | -2/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | preparing for 5.10.1v5.10.1 | Rainer Gerhards | 2012-10-17 | 1 | -2/+2 |
| | | | | |||||
| | * | | cleanup: removed remains of -c option (compatibility mode) | Rainer Gerhards | 2012-10-16 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions | ||||
| * | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 1 | -1/+9 |
| |\| | | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-16 | 1 | -0/+8 |
| | |\| | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| | | * | bugfix: imuxsock truncated head of received message | Rainer Gerhards | 2012-10-16 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. Note that Milan sent a patch, which solved the problem under some conditions (can be found somewhat earlier in git history). However, it did not handle the original root cause, and so did not fix the problem always. The main reason was that the date parser modifies the provided lenghts. That part of the API was not properly used by the caller (who decremented the length once more). | ||||
| | * | | doc: fix minor small but important typo in ChangeLog | Rainer Gerhards | 2012-10-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 1 | -0/+6 |
| |\| | | |||||
| | * | | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch. | ||||
| * | | | preparing for 6.5.1 releasev6.5.1 | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| |\| | | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| | |\| | |||||
| | | * | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created. | ||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| |\| | | |||||
| | * | | bugfix: comments inside objects (e.g. action()) were not properly handled | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| | | | | |||||
| * | | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-02 | 1 | -0/+2 |
| |\| | | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 1 | -0/+2 |
| | |\| | |||||
| | | * | bugfix: fixed wrong bufferlength for snprintf in tcpflood.c | Andre Lorbach | 2012-09-28 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail. | ||||
| * | | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
| * | | | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 1 | -0/+3 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel-input | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
| |\| | | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
| | |\| | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c | ||||
| | | * | enable DNS resolution in imrelp | Apollon Oikonomopoulos | 2012-09-26 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-21 | 1 | -0/+4 |
| |\| | | |||||
| | * | | bugfix: some valid legacy PRI filters were flagged as errornous | Rainer Gerhards | 2012-09-21 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358 This happend to filters of the style "local0,local1.*", where the multiple facilities were comma-separated. | ||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
| |\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | doc: add last bugfix to ChangeLog | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -1/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | | |||||
| * | | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-19 | 1 | -0/+2 |
| |\| | | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |