Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Rainer Gerhards | 2012-10-18 | 2 | -3/+3 |
|\ | |||||
| * | build: Drop unused CNF_LIBS variable | Michael Biebl | 2012-10-18 | 1 | -2/+2 |
| * | doc: typo fix | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
* | | Merge branch 'beta' | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 |
|\| | |||||
| * | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 |
| |\ | |||||
| | * | cleanup: removed remains of -c option (compatibility mode) | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 |
* | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 2 | -2/+8 |
|\| | | |||||
| * | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 1 | -1/+7 |
| * | | fix double-free | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| * | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -2/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-10 | 1 | -3/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | cosmetic cleanup | Rainer Gerhards | 2012-10-09 | 1 | -3/+1 |
* | | | | Merge branch 'c1-streamzip' into master-streamzip | Rainer Gerhards | 2012-10-05 | 1 | -3/+12 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | improved omfile zip writer to increase compression | Rainer Gerhards | 2012-09-14 | 1 | -0/+8 |
* | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -2/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | build: don't include librsyslog.la in the dist tarball | Michael Biebl | 2012-10-04 | 1 | -2/+1 |
| * | | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 2 | -0/+468 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 2 | -456/+468 |
| * | | | add new tool "logctl" to access lumberjack logs in MongoDB | Ulrike Gerhards | 2012-10-02 | 1 | -0/+456 |
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
|\| | | | |||||
| * | | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
* | | | | bugfix: omfile action did not respect "template" parameter | Rainer Gerhards | 2012-09-19 | 1 | -1/+3 |
* | | | | correct library link order | Rainer Gerhards | 2012-09-11 | 1 | -1/+1 |
* | | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-06 | 2 | -1/+11 |
|\| | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-06 | 2 | -1/+11 |
| |\| | | |||||
| | * | | Fixed TCP CheckConnection handling in omfwd.c. | Andre Lorbach | 2012-08-25 | 1 | -1/+10 |
| | * | | bugfix: omusrsmsg incorrect return state & config warning handling | Rainer Gerhards | 2012-08-28 | 1 | -0/+1 |
| | * | | cleanup: remove left-over commented-out code | Rainer Gerhards | 2012-08-25 | 1 | -10/+0 |
* | | | | new ruleengine: some cleanup | Rainer Gerhards | 2012-09-06 | 1 | -5/+0 |
|/ / / | |||||
* | | | add uuid property to message object | Jérôme Renard | 2012-08-26 | 1 | -1/+1 |
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 2 | -25/+72 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 2 | -22/+71 |
| |\ \ | |||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 1 | -4/+59 |
| | |\| | |||||
| | | * | bugfix: multiple main queues with same queue file name were not detected | Rainer Gerhards | 2012-08-22 | 1 | -1/+40 |
| | * | | changed TRUE/FALSE to RSTRUE/RSFALSE | Rainer Gerhards | 2012-08-22 | 1 | -3/+3 |
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-15 | 1 | -0/+1 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 1 | -3/+19 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | bugfix: potential abort if output plugin logged message during shutdown | Rainer Gerhards | 2012-08-01 | 1 | -3/+19 |
| | | |/ | | |/| | |||||
| | * | | bugfix "$PreserveFQDN on" was not honored in some modules | Rainer Gerhards | 2012-06-12 | 1 | -0/+1 |
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | omelasticsearch: added transactional interface & better debug output | Rainer Gerhards | 2012-05-24 | 1 | -1/+1 |
* | | | | | ompipe: fix copy&paste name errors | Rainer Gerhards | 2012-06-25 | 1 | -3/+3 |
* | | | | | omfwd: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 1 | -8/+127 |
* | | | | | ompipe: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 1 | -5/+97 |
* | | | | | a bit more cleanup | Rainer Gerhards | 2012-06-25 | 1 | -5/+2 |