Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-25 | 1 | -2/+1 |
|\ | |||||
| * | doc: fix html formatting | Michael Biebl | 2012-10-25 | 1 | -2/+1 |
| | | |||||
| * | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'v6-beta' into v6-stable | Rainer Gerhards | 2012-10-22 | 20 | -152/+1289 |
| |\ | |||||
| | * | 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/+15 |
| | |\ | |||||
* | | | | make rsyslog core suspened actions after 10 failures in a row | Rainer Gerhards | 2012-10-24 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | This was former the case after 1,000 failures and could cause rsyslog to be spammed/ressou | ||||
* | | | | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized. | ||||
* | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Merge branch 'v5-stable' into v6-stablev6.4.3.unfinished | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | doc: v3 compatibility doc lists invalid config directive | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365 | ||||
| | * | | preparing for 5.10.1v5.10.1 | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | preparing for 5.10.0 releasev5.10.0 | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | preparing for 5.9.7v5.9.7 | Rainer Gerhards | 2012-05-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 2 | -10/+19 |
| | |\ \ | |||||
| | | * | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -0/+9 |
| | | | | | |||||
* | | | | | preparing for 7.1.12 releasev7.1.12 | Rainer Gerhards | 2012-10-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | prepare for version 7.1.11v7.1.11 | Rainer Gerhards | 2012-10-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 1 | -0/+17 |
| | | | | | |||||
* | | | | | preparing for 7.1.10 releasev7.1.10 | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | prepare for 7.1.9 releasev7.1.9 | Rainer Gerhards | 2012-10-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | doc: add missing files to distribution tarball | Rainer Gerhards | 2012-10-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem. | ||||
* | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 |
|\| | | | | |||||
| * | | | | doc: add missing files to distribution tarball | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem. | ||||
| * | | | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | prepare for 7.1.8 releasev7.1.8 | Rainer Gerhards | 2012-10-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | doc: update module doc to new capabilities | Florian Riedl | 2012-10-02 | 6 | -64/+135 |
| | | | | | |||||
* | | | | | preparing for 7.1.7 releasev7.1.7 | Rainer Gerhards | 2012-10-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | doc: add SQL-template example | Tim Eifler | 2012-10-01 | 1 | -0/+29 |
| | | | | | |||||
* | | | | | preparing for 7.1.6 releasev7.1.6 | Rainer Gerhards | 2012-09-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-28 | 5 | -107/+373 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | doc: update module doc to new config format | Florian Riedl | 2012-09-28 | 5 | -107/+373 |
| | | | | | |||||
* | | | | | preparing for 7.1.5v7.1.5 | Rainer Gerhards | 2012-09-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'milan/imkmsg' | Rainer Gerhards | 2012-09-24 | 1 | -0/+48 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation for new imkmsg module | Milan Bartos | 2012-09-24 | 1 | -0/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | new file: doc/imkmsg.html | ||||
* | | | | | | doc: Improve template system doc | Rainer Gerhards | 2012-09-24 | 1 | -51/+151 |
|/ / / / / | |||||
* | | | | | Fiddeling a bit with the template doc | Florian Riedl | 2012-09-24 | 1 | -60/+111 |
| | | | | | |||||
* | | | | | Implement RainerScript prifield() function | Rainer Gerhards | 2012-09-20 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Implement RainerScript field() function | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -1/+4 |
|\| | | | | |||||
| * | | | | doc: add new functions to RainerScript function list | Rainer Gerhards | 2012-09-20 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | preparing for 7.1.4 releasev7.1.4 | Rainer Gerhards | 2012-09-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Implement ability for CEE-based properties to be stored in disk queues | Rainer Gerhards | 2012-09-19 | 1 | -1/+9 |
| | | | | | |||||
* | | | | | doc: begin rewrite of template doc | Rainer Gerhards | 2012-09-19 | 1 | -42/+157 |
| | | | | | |||||
* | | | | | preparing for 7.1.3 releasev7.1.3 | Rainer Gerhards | 2012-09-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-13 | 1 | -0/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-13 | 1 | -0/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c | ||||
| | * | | | bugfix: missing support for escape sequences in RainerScript | Rainer Gerhards | 2012-09-13 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only \' was supported. Now the usual set is supported. Note that v5 used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later. | ||||
| | * | | | preparing for 6.4.1 releasev6.4.1 | Rainer Gerhards | 2012-09-06 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | INCOMPATIBLE: use :, not =, as separator for jsonf | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSON fields are "name":value, not "name"=value. Therefore change the jsonf flag to use a colon. Signed-off-by: Miloslav Trmač <mitr@redhat.com> |