Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 1 | -22/+69 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 1 | -19/+68 |
| |\ | |||||
| | * | 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 |
| | * | | 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 |
* | | | | implemented freeCnf() module interface & fixed some mem leaks | Rainer Gerhards | 2012-06-25 | 1 | -22/+5 |
* | | | | milestone: regex is compiled from script based filter | Rainer Gerhards | 2012-06-12 | 1 | -0/+2 |
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-06 | 1 | -0/+5 |
|\| | | | |||||
| * | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-06 | 1 | -0/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-06 | 1 | -0/+5 |
| | |\| | |||||
| | | * | add small delay (50ms) after sending shutdown message | Rainer Gerhards | 2012-06-04 | 1 | -0/+5 |
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-01 | 1 | -2/+2 |
|\| | | | |||||
| * | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-01 | 1 | -2/+2 |
| |\| | | |||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-01 | 1 | -2/+2 |
| | |\| | |||||
| | | * | cosmetic: slightly improved debug output | Rainer Gerhards | 2012-05-31 | 1 | -2/+2 |
* | | | | added --enable-debugless configure option for very high demanding environments | Rainer Gerhards | 2012-05-29 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-05-29 | 1 | -0/+3 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-29 | 1 | -0/+3 |
| |\| | |||||
| | * | bugfix: if debug message could end up in log file when forking | Tomas Heinrich | 2012-05-29 | 1 | -0/+3 |
| | * | cleanup: removing no longer needed macros | Rainer Gerhards | 2012-05-04 | 1 | -1/+1 |
| * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-03 | 1 | -0/+1 |
| |\| | |||||
| | * | debug: slightly improved debug info for input module startup | Rainer Gerhards | 2012-05-03 | 1 | -0/+1 |
* | | | cleanup no longer used variable | Rainer Gerhards | 2012-05-03 | 1 | -1/+0 |
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-04-12 | 1 | -72/+97 |
|\| | | |||||
| * | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 1 | -73/+97 |
| |\ \ | |||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 1 | -73/+97 |
| | |\| | |||||
| | | * | imuxsock: do not cache hostname | Rainer Gerhards | 2012-04-12 | 1 | -1/+1 |
| | | * | Allocate LocalDomain as new string | Marius Tomaschewski | 2012-04-11 | 1 | -0/+3 |
| | | * | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 1 | -72/+93 |
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 1 | -8/+2 |
| |\| | | |||||
| * | | | cosmetic: removed stray definition | Rainer Gerhards | 2012-03-12 | 1 | -1/+0 |
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 1 | -2/+9 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 1 | -8/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 1 | -9/+2 |
| | |/ / | |/| | | |||||
| * | | | added capability to use a local interface IP address as fromhost-ip for imuxsock | Rainer Gerhards | 2012-03-06 | 1 | -0/+1 |
| * | | | queue: lightdelay config: keep default of 70% until mark is explicitely set | Rainer Gerhards | 2012-02-22 | 1 | -3/+5 |
| * | | | added configuration directives to customize queue light delay marks | Rainer Gerhards | 2012-02-21 | 1 | -2/+6 |
| | |/ | |/| | |||||
* | | | refactor: remove very old sync.[ch] system for "abstracting" mutex access | Rainer Gerhards | 2012-01-19 | 1 | -2/+2 |
* | | | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -1/+7 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 1 | -0/+3 |
| |\ \ | |||||
| | * | | add elasticsearch output module | Nathan Scott | 2012-01-17 | 1 | -0/+3 |
| | |/ | |||||
| * | | fix error of not define HAVE_SETSID | Peng Haitao | 2012-01-16 | 1 | -0/+7 |
| * | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-16 | 1 | -1/+21 |
| |\| | |||||
| * | | Merge branch 'v4-stable-tmp' into v5-devel-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+3 |
| |\ \ | |||||
| | * \ | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+9 |
| | |\ \ | |||||
| | | * | | added $SpaceLFOnReceive config directive | Tomas Heinrich | 2012-01-10 | 1 | -0/+9 |
| | * | | | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+3 |
| | |\| | |