Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move cJSON to omelasticsearch | Rainer Gerhards | 2012-10-29 | 13 | -7/+5 |
* | Merge branch 'beta-jsonrt' into master-es | Rainer Gerhards | 2012-10-29 | 15 | -49/+1450 |
|\ | |||||
| * | omelasticsearch: improved debug logging | Rainer Gerhards | 2012-07-30 | 1 | -2/+5 |
| * | omelasticsearch: support for writing data errors to local file added | Rainer Gerhards | 2012-07-30 | 3 | -14/+113 |
| * | omelasticsearch: mileston: bulk reply is parsed | Rainer Gerhards | 2012-07-30 | 1 | -2/+48 |
| * | omelasticsearch: parse JSON response (in regard to data errors) | Rainer Gerhards | 2012-07-25 | 3 | -38/+67 |
| * | add cJSON to rsyslog runtime | Rainer Gerhards | 2012-07-25 | 10 | -2/+1225 |
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-29 | 2 | -1/+2 |
|\ \ | |||||
| * | | bugfix: ruleset()-object did only support a single statement | Rainer Gerhards | 2012-10-27 | 2 | -1/+2 |
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-27 | 5 | -4/+18 |
|\| | | |||||
| * | | add -D rsyslogd option to enable config parser debug mode | Rainer Gerhards | 2012-10-27 | 3 | -1/+14 |
| * | | Improve syntax error messages by outputting the error token | Rainer Gerhards | 2012-10-27 | 2 | -1/+3 |
| * | | 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 |
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-24 | 6 | -17/+38 |
|\| | | | |||||
| * | | | cleanup | Rainer Gerhards | 2012-10-24 | 2 | -3/+1 |
| * | | | make rsyslog core suspened actions after 10 failures in a row | Rainer Gerhards | 2012-10-24 | 3 | -1/+15 |
| * | | | ommongodb rate-limits error messages to prevent spamming the syslog | Rainer Gerhards | 2012-10-24 | 2 | -13/+22 |
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-23 | 4 | -8/+17 |
|\| | | | |||||
| * | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-22 | 2 | -5/+11 |
| |\| | | |||||
| | * | | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 5 | -7/+10 |
| | * | | Merge branch 'v6-beta' into v6-stable | Rainer Gerhards | 2012-10-22 | 88 | -935/+7279 |
| | |\ \ | |||||
| | | * \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| | | |\ \ | |||||
| | | * | | | 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 | 2 | -5/+1 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 6 | -45/+22 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 2 | -9/+11 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | preparing for 6.5.1 releasev6.5.1 | Rainer Gerhards | 2012-10-11 | 3 | -3/+3 |
| * | | | | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 5 | -5/+8 |
| * | | | | | | | | | testbench: -c option no longer exists | Rainer Gerhards | 2012-10-22 | 1 | -2/+2 |
* | | | | | | | | | | bugfix: segfault on startup when modules using MSG_PASSING mode are used | Rainer Gerhards | 2012-10-23 | 2 | -1/+5 |
* | | | | | | | | | | Merge branch 'beta-newgrammar' | Rainer Gerhards | 2012-10-22 | 2 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | permit action-like statements (stop, call, ...) in action lists | Rainer Gerhards | 2012-10-22 | 2 | -3/+5 |
* | | | | | | | | | | | re-enable deprecated warings for omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 2 | -8/+0 |
* | | | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-22 | 4 | -9/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | disable deprecated warnings in omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 2 | -0/+8 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | doc: remove BSD blocks from rsyslog.conf manpage | Rainer Gerhards | 2012-10-22 | 1 | -8/+1 |
| * | | | | | | | | | 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 |
* | | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| | |\| | | | | | | | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | | * | | | | | | fix epoll-enabled code to use correct data member for pointers | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
* | | | | | | | | | doc: improve module doc | Florian Riedl | 2012-10-19 | 1 | -26/+42 |
* | | | | | | | | | prepare for 7.3.1 releasev7.3.1 | Rainer Gerhards | 2012-10-19 | 3 | -3/+3 |
* | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 2 | -7/+5 |
|\| | | | | | | | | |||||
| * | | | | | | | | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -2/+3 |
| * | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 2 | -5/+1 |
| |\| | | | | | | |