Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-devel' into tmp | Rainer Gerhards | 2013-11-29 | 3 | -0/+45 |
|\ | | | | | | | | | Conflicts: action.c | ||||
| * | document new global parameter | Rainer Gerhards | 2013-11-29 | 1 | -0/+7 |
| | | |||||
| * | fix merge problem | Rainer Gerhards | 2013-11-29 | 1 | -4/+3 |
| | | |||||
| * | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-29 | 3 | -0/+39 |
| |\ | |||||
| | * | doc: create skeleton for global() config object | Rainer Gerhards | 2013-11-29 | 3 | -0/+39 |
| | | | |||||
* | | | preparing for 8.1.2 release | Rainer Gerhards | 2013-11-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master-lognorm1' | Rainer Gerhards | 2013-11-28 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | Allow path parameter to place normalized fields as subtree | Pavel Levshin | 2013-11-25 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-27 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/queue.c | ||||
| * | | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-27 | 1 | -2/+2 |
| |\| | |||||
| | * | doc: remove some implementation details | Rainer Gerhards | 2013-11-27 | 1 | -2/+2 |
| | | | |||||
| * | | bumping version number | Rainer Gerhards | 2013-11-25 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-23 | 1 | -0/+7 |
|\| | | |||||
| * | | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-23 | 1 | -0/+7 |
| |\| | |||||
| | * | doc: add link to new online impstats analyzer tool | Rainer Gerhards | 2013-11-22 | 1 | -0/+7 |
| | | | |||||
* | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-22 | 1 | -0/+23 |
|\| | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| * | | bugfix: mmpstrucdata generated inaccessible properties | Rainer Gerhards | 2013-11-21 | 1 | -0/+23 |
| | | | |||||
* | | | Merge branch 'v7-devel' | Rainer Gerhards | 2013-11-21 | 1 | -1/+13 |
|\| | | |||||
| * | | doc: add new queue parameter | Rainer Gerhards | 2013-11-21 | 1 | -1/+13 |
| | | | |||||
| * | | Merge branch 'v7-stable' into v7-devel | Rainer Gerhards | 2013-11-19 | 1 | -1/+2 |
| |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imuxsock/imuxsock.c | ||||
* | | | prepare for 8.1.1 releasev8.1.1 | Rainer Gerhards | 2013-11-19 | 1 | -1/+1 |
| | | | |||||
* | | | doc: omhiredis now works on v8 | Rainer Gerhards | 2013-11-18 | 1 | -1/+0 |
| | | | |||||
* | | | mmaudit: now supports v8 output module interface and work again | Rainer Gerhards | 2013-11-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-11-16 | 1 | -1/+2 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| * | | doc typo fix | Rainer Gerhards | 2013-11-15 | 1 | -1/+1 |
| | | | |||||
| * | | doc: fix glitch in v6+ parameter description | Rainer Gerhards | 2013-11-15 | 1 | -1/+2 |
| | | | |||||
* | | | doc: note that v8 output module interface is not yet stable | Rainer Gerhards | 2013-11-13 | 1 | -0/+4 |
| | | | |||||
* | | | document yet-untested modules | Rainer Gerhards | 2013-11-13 | 1 | -1/+19 |
| | | | |||||
* | | | documented modules not yet supported in v8 | Rainer Gerhards | 2013-11-13 | 1 | -0/+18 |
| | | | |||||
* | | | doc: remove copy&paste leftover | Rainer Gerhards | 2013-11-13 | 1 | -2/+0 |
| | | | |||||
* | | | bump version number | Rainer Gerhards | 2013-11-13 | 1 | -1/+1 |
| | | | |||||
* | | | doc: fix invalid HTML | Rainer Gerhards | 2013-11-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master-ruleeng' into master-ruleeng-simd | Rainer Gerhards | 2013-11-06 | 1 | -4/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_actions.html | ||||
| * \ \ | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-11-06 | 1 | -5/+14 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-11-06 | 1 | -5/+14 |
| | |\| | |||||
| | | * | doc: describe failover action preciseness | Rainer Gerhards | 2013-11-06 | 1 | -5/+14 |
| | | | | |||||
| | | * | prepare for 7.4.6 releasev7.4.6 | Rainer Gerhards | 2013-10-29 | 1 | -1/+1 |
| | | | | |||||
| | | * | preparing for 7.4.5v7.4.5 | Rainer Gerhards | 2013-10-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | doc: document output plugin calling interface changes | Rainer Gerhards | 2013-11-06 | 1 | -1/+38 |
| | | | | |||||
* | | | | make "write all mark messages" default behaviour -- improves processing speed | Rainer Gerhards | 2013-11-06 | 2 | -2/+14 |
| | | | | |||||
* | | | | doc: add v8 compatibility document | Rainer Gerhards | 2013-11-06 | 3 | -11/+53 |
|/ / / | |||||
* | | | Merge branch 'master' into master-ruleeng | Rainer Gerhards | 2013-11-05 | 1 | -1/+8 |
|\| | | |||||
| * | | doc: amend queue parameter doc with live web link | Rainer Gerhards | 2013-11-05 | 1 | -1/+4 |
| | | | |||||
| * | | doc: clarify lower limit of queue.size parameter | Rainer Gerhards | 2013-11-05 | 1 | -1/+5 |
| | | | |||||
* | | | doc: omstdout now works under v8 | Rainer Gerhards | 2013-11-01 | 1 | -1/+1 |
| | | | |||||
* | | | doc: omruleset now supported on v8 | Rainer Gerhards | 2013-11-01 | 1 | -1/+1 |
| | | | |||||
* | | | omjournal: support v8 omod interface | Rainer Gerhards | 2013-11-01 | 1 | -1/+1 |
| | | | |||||
* | | | ommysql: add support for v8 output module interface | Rainer Gerhards | 2013-10-31 | 1 | -1/+1 |
| | | | |||||
* | | | doc: mention which modules are not supported in v8 | Rainer Gerhards | 2013-10-31 | 1 | -17/+17 |
| | | | |||||
* | | | doc: clarify rulesets and main queues | Rainer Gerhards | 2013-10-30 | 1 | -0/+9 |
|/ / |