Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | made new uuid property threadsafe | Rainer Gerhards | 2012-08-26 | 1 | -0/+4 |
| | |||||
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-26 | 1 | -0/+12 |
|\ | |||||
| * | doc: add incompatible patch info to ChangeLog | Rainer Gerhards | 2012-08-26 | 1 | -0/+12 |
| | | |||||
* | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 1 | -3/+30 |
|\| | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | ||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 1 | -2/+23 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+6 |
| | | | |||||
| | * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 1 | -2/+6 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | preparing for 5.8.13 release | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 1 | -0/+10 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c | ||||
| | | * | bugfix: multiple main queues with same queue file name were not detected | Rainer Gerhards | 2012-08-22 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog. | ||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-15 | 1 | -0/+5 |
| | |\ \ | |||||
| * | | | | nitfix: status indication (now: stable) was invalid in ChangeLog | Rainer Gerhards | 2012-08-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 1 | -0/+5 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | undo last queue patch - caused a regression | Rainer Gerhards | 2012-08-01 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided | ||||
| | * | | | bugfix: potential abort if output plugin logged message during shutdown | Rainer Gerhards | 2012-08-01 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347 | ||||
| | * | | | bugfix: DA queue fixed handling of bad queue files. | Andre Lorbach | 2012-07-31 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | preparing for 6.4.0 release | Rainer Gerhards | 2012-08-20 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | doc: add imported patch to ChangeLog | Rainer Gerhards | 2012-08-21 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Rainer Gerhards | 2012-08-02 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-08-01 | 1 | -0/+3 |
| |\| | | | | |||||
| | * | | | | doc: add last patch to Changelog | Rainer Gerhards | 2012-08-01 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | doc: added last patch to ChangeLog | Rainer Gerhards | 2012-07-31 | 1 | -0/+2 |
|/ / / / / | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-07-24 | 1 | -3/+8 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was used | Rainer Gerhards | 2012-07-24 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-07-24 | 1 | -0/+1 |
| |\| | | | |||||
| * | | | | bugfix: imtcp aborted when more than 2 connections were used. | Andre Lorbach | 2012-07-11 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342 | ||||
| * | | | | omelasticsearch: support for parameters parent & dynparent added | Rainer Gerhards | 2012-07-10 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | preparing for 6.3.12v6.3.12 | Rainer Gerhards | 2012-07-02 | 1 | -3/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' | Rainer Gerhards | 2012-07-24 | 1 | -0/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | bugfix: DA queue could cause abort | Rainer Gerhards | 2012-07-24 | 1 | -0/+1 |
| | |_|/ | |/| | | | | | | | | | | | | | | ...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked. | ||||
* | | | | bugfix: omhdfs did no longer compile | Rainer Gerhards | 2012-07-11 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 1 | -0/+7 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | | cosmetic: added info about omelasticsearch to ChangeLog | Rainer Gerhards | 2012-06-29 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge branch 'beta' into master-module | Rainer Gerhards | 2012-06-29 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| * | | | bugfix: $ActionName was not properly honored | Rainer Gerhards | 2012-06-27 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Thanks to Abby Edwards for alerting us. | ||||
| * | | | preparing for 6.3.11v6.3.11 | Rainer Gerhards | 2012-06-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | implemented freeCnf() module interface & fixed some mem leaks | Rainer Gerhards | 2012-06-25 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable. | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-15 | 1 | -0/+5 |
|\| | | | |||||
| * | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-15 | 1 | -0/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c | ||||
| | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-15 | 1 | -0/+5 |
| | |\| | | |||||
| | | * | | bugfix: randomized IP option header in omudpspoof caused problems | Rainer Gerhards | 2012-06-15 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327 Thanks to Rick Brown for helping to test out the patch. | ||||
| | | * | | bugfix "$PreserveFQDN on" was not honored in some modules | Rainer Gerhards | 2012-06-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. --------------------------------------------- | ||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-14 | 1 | -1/+3 |
|\| | | | | |||||
| * | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-14 | 1 | -1/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | preparing for 6.2.2 releasev6.2.2 | Rainer Gerhards | 2012-06-13 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | cosmetic: merge remains in ChangeLog cleared up | Rainer Gerhards | 2012-06-12 | 1 | -3/+0 |
| | | | | | |||||
* | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-06-11 | 1 | -0/+5 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-11 | 1 | -0/+6 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: ChangeLog | ||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-11 | 1 | -0/+25 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-11 | 1 | -0/+25 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html |