| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v7-devel' into tmp | Rainer Gerhards | 2013-11-29 | 1 | -0/+7 |
| |\ | | | | | | | | | Conflicts: action.c | ||||
| | * | actions now report if they suspend and resume themselves | Rainer Gerhards | 2013-11-29 | 1 | -0/+3 |
| | | | |||||
| | * | add new impstats action counters: | Rainer Gerhards | 2013-11-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | * suspended * suspended.duration * resumed | ||||
| * | | doc: fix cut&paste errorv8.1.2 | Rainer Gerhards | 2013-11-28 | 1 | -1/+1 |
| | | | |||||
| * | | preparing for 8.1.2 release | Rainer Gerhards | 2013-11-28 | 1 | -2/+5 |
| | | | |||||
| * | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-27 | 1 | -0/+4 |
| |\| | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | Merge branch 'c10' into v7-devel | Rainer Gerhards | 2013-11-27 | 1 | -0/+3 |
| | |\ | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | bugfix: mmrfc5424addhmac: "key" parameter was not properly processed | Rainer Gerhards | 2013-11-27 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-27 | 1 | -6/+6 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/queue.c | ||||
| | * | | bumping version number | Rainer Gerhards | 2013-11-25 | 1 | -6/+6 |
| | | | | |||||
| * | | | doc: maintain ChangeLog | Rainer Gerhards | 2013-11-26 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-22 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | * | | bugfix: mmpstrucdata generated inaccessible properties | Rainer Gerhards | 2013-11-21 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-21 | 1 | -0/+9 |
| |\| | | | | | | | | | | | | | | Conflicts: runtime/queue.c | ||||
| | * | | queue: dynamic default for discardMark, emit warning if set very low | Rainer Gerhards | 2013-11-21 | 1 | -0/+3 |
| | | | | |||||
| * | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-21 | 1 | -0/+3 |
| |\| | | |||||
| | * | | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-21 | 1 | -0/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c | ||||
| | | * | | doc: maintain ChangeLog | Rainer Gerhards | 2013-11-21 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-20 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | * | | | bugfix: RainerScript optimizer did not optimize PRI filters | Rainer Gerhards | 2013-11-20 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | things like "if $syslogfacility-text == "local3"" were not converted to PRIFILT. This was a regression introduced in 7.5.6. | ||||
| * | | | | doc: maintain ChangeLog | Rainer Gerhards | 2013-11-19 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-19 | 1 | -0/+6 |
| |\| | | | |||||
| | * | | | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-19 | 1 | -0/+1 |
| | |\| | | |||||
| | | * | | bugfix: legacy directive $ActionQueueWorkerThreads was not honored | Rainer Gerhards | 2013-11-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c | ||||
| | * | | | queue.workerThreadMinimumMessage set to queue.size / num workers | Rainer Gerhards | 2013-11-19 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | bugfix: legacy directive $ActionQueueWorkerThreads was not honored | Rainer Gerhards | 2013-11-19 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | queue: auto-adjust watermarks | Rainer Gerhards | 2013-11-19 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | prepare for 8.1.1 releasev8.1.1 | Rainer Gerhards | 2013-11-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-19 | 1 | -11/+17 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-19 | 1 | -8/+15 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imuxsock/imuxsock.c | ||||
| | | * | | bugfix: segfault on startup when certain script constructs are used | Rainer Gerhards | 2013-11-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | e.g. "if not $msg ..." | ||||
| * | | | | bugfix: STOP/discard(~) was mostly NOT honored | Rainer Gerhards | 2013-11-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | This lead to execution of config code that was not meant to be executed. | ||||
| * | | | | bugfix: memory leak on worker thread termination | Rainer Gerhards | 2013-11-18 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | bugfix: potential segfault in omfile under heavy load | Rainer Gerhards | 2013-11-18 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | doc: maintain ChangeLog | Rainer Gerhards | 2013-11-18 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | doc: omhiredis now works on v8 | Rainer Gerhards | 2013-11-18 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | bugfix: potential abort on startup in debug mode | Rainer Gerhards | 2013-11-17 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This depends on template type being used. The root cause was a non-necessary debug output, which were at the wrong spot (leftover from initial testing). Thanks to Pavel Levshin for alerting us and providing a patch proposal. | ||||
| * | | | | mmaudit: now supports v8 output module interface and work again | Rainer Gerhards | 2013-11-17 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-11-16 | 1 | -0/+3 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| | * | | | bugfix: imuxsock: UseSysTimeStamp config parameter did not work correctly | Rainer Gerhards | 2013-11-15 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | Thanks to Tomas Heinrich for alerting us and provinding a solution suggestion. | ||||
| * | | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-15 | 1 | -0/+6 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-15 | 1 | -0/+6 |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | * | | doc: add Tomas' patch to ChangeLog | Rainer Gerhards | 2013-11-15 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | prepare for 8.1.0 releasev8.1.0 | Rainer Gerhards | 2013-11-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | bump version number | Rainer Gerhards | 2013-11-13 | 1 | -0/+14 |
| | | | | | |||||
| * | | | | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-11-08 | 1 | -0/+2 |
| |\| | | | |||||
| | * | | | doc: maintain ChangeLog | Rainer Gerhards | 2013-11-08 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-11-07 | 1 | -0/+2 |
| |\| | | | |||||
| | * | | | emit warning message if output module with msg passing mode runs asynchronously | Rainer Gerhards | 2013-11-07 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-11-07 | 1 | -4/+16 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/wti.c runtime/wti.h | ||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |