Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 |
|\ | |||||
| * | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch. | ||||
* | | preparing for 6.5.1 releasev6.5.1 | Rainer Gerhards | 2012-10-11 | 3 | -3/+3 |
| | | |||||
* | | remove some assert()'s - valgrind does a better job... | Rainer Gerhards | 2012-10-11 | 1 | -4/+0 |
| | | |||||
* | | fix small memory leak with string-type templates | 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 |
| | | |||||
* | | re-enabled commented-out serialization support in debug handler | Rainer Gerhards | 2012-10-11 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 5 | -29/+2 |
|\| | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 4 | -27/+1 |
| |\ | |||||
| | * | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 4 | -27/+1 |
| | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created. | ||||
| * | | build: don't include librsyslog.la in the dist tarball | Michael Biebl | 2012-10-04 | 1 | -2/+1 |
| | | | | | | | | | | | | libtool archives are not meant to be shipped in the source tarball. | ||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 4 | -0/+32 |
|\| | | |||||
| * | | 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. | ||||
| * | | bugfix: comments inside objects (e.g. action()) were not properly handled | Rainer Gerhards | 2012-10-04 | 2 | -0/+2 |
| | | | |||||
| * | | cosmetic: add few files to .gitignore | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 |
| | | | |||||
* | | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 4 | -456/+482 |
| | | | |||||
* | | | add new tool "logctl" to access lumberjack logs in MongoDB | Ulrike Gerhards | 2012-10-02 | 1 | -0/+456 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-02 | 2 | -1/+3 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 1 | -2/+2 |
| |\| | |||||
| | * | minor: disable debug support in complex1.sh test | Rainer Gerhards | 2012-10-02 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 3 | -3/+5 |
| |\| | |||||
| | * | cleanup | Rainer Gerhards | 2012-10-02 | 1 | -1/+1 |
| | | | |||||
| | * | bugfix: fixed wrong bufferlength for snprintf in tcpflood.c | Andre Lorbach | 2012-09-28 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail. | ||||
* | | | Merge branch 'v6-devel-input' into v6-devel | Rainer Gerhards | 2012-09-28 | 8 | -153/+578 |
|\ \ \ | |||||
| * | | | doc: update module doc to new config format | Florian Riedl | 2012-09-28 | 5 | -107/+373 |
| | | | | |||||
| * | | | imtcp: implement support for module() parameters | Rainer Gerhards | 2012-09-28 | 1 | -38/+135 |
| | | | | |||||
| * | | | imptcp: implement support for module() parameters | Rainer Gerhards | 2012-09-27 | 1 | -7/+70 |
| | | | | |||||
| * | | | fix whitespace issue | Rainer Gerhards | 2012-09-27 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'v6-devel-input' into v6-devel | Rainer Gerhards | 2012-09-27 | 16 | -244/+1173 |
|\| | | | |||||
| * | | | Do not load module if it had errorneous parameters | Rainer Gerhards | 2012-09-27 | 3 | -12/+58 |
| | | | | |||||
| * | | | cosmetic: remove irrelevant compiler warning | Rainer Gerhards | 2012-09-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | v7 does not even have this code any longer | ||||
| * | | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 4 | -28/+114 |
| | | | | | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
| * | | | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 2 | -9/+80 |
| | | | | |||||
| * | | | yet another nitfix... | Rainer Gerhards | 2012-09-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | nitfix | Rainer Gerhards | 2012-09-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | imfile: implement support for input() | Rainer Gerhards | 2012-09-27 | 1 | -3/+78 |
| | | | | |||||
| * | | | milestone: port imfile to v6 config system | Rainer Gerhards | 2012-09-26 | 2 | -149/+279 |
| | | | | |||||
| * | | | imrelp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+76 |
| | | | | |||||
| * | | | imudp: implement support for input() | Rainer Gerhards | 2012-09-26 | 2 | -9/+84 |
| | | | | |||||
| * | | | imptcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 2 | -15/+119 |
| | | | | |||||
| * | | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | | | |||||
| * | | | imtcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+89 |
| | | | | |||||
| * | | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -3/+0 |
| | | | | |||||
| * | | | Implement input() support in imuxsock | Rainer Gerhards | 2012-09-26 | 1 | -10/+119 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel-input | Rainer Gerhards | 2012-09-26 | 2 | -0/+9 |
| |\| | | |||||
| * | | | input stmt: add core engine plumbing | Rainer Gerhards | 2012-09-26 | 5 | -1/+96 |
| | | | | |||||
| * | | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | | | |||||
* | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-26 | 2 | -0/+9 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-26 | 2 | -0/+9 |
| |\| | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c | ||||
| | * | enable DNS resolution in imrelp | Apollon Oikonomopoulos | 2012-09-26 | 2 | -0/+9 |
| | | |