Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | refactor: removing v6.1 scoping code | Rainer Gerhards | 2012-01-19 | 2 | -140/+12 |
* | v6.1/2 scoping support removed from plugins | Rainer Gerhards | 2012-01-19 | 1 | -34/+3 |
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-19 | 4 | -16/+4 |
|\ | |||||
| * | removing the newScope/resumeScope macro interfaces | Rainer Gerhards | 2012-01-19 | 4 | -16/+4 |
* | | Merge branch 'v6-stable-noscoping' into master | Rainer Gerhards | 2012-01-19 | 8 | -85/+76 |
|\| | |||||
| * | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 7 | -37/+28 |
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-18 | 67 | -1036/+912 |
| |\ | |||||
* | \ | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 2 | -1/+11 |
|\ \ \ | |||||
| * \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-16 | 67 | -1036/+912 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 67 | -1036/+912 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-09 | 1 | -5/+5 |
| | |\ \ \ | |||||
| * | | | | | part of merge, but forgot to add to merge set | Rainer Gerhards | 2012-01-10 | 1 | -0/+3 |
| * | | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmp | Rainer Gerhards | 2012-01-10 | 1 | -1/+5 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -1/+5 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | added $SpaceLFOnReceive config directive | Tomas Heinrich | 2012-01-10 | 1 | -1/+5 |
| * | | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-01-09 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
* | | | | | | | | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 53 | -812/+716 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 65 | -1001/+882 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | license changes | Rainer Gerhards | 2012-01-16 | 45 | -704/+617 |
| | * | | | | | | | runtime license change | Rainer Gerhards | 2012-01-16 | 20 | -297/+265 |
| * | | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 |
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | license change | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-09 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-09 | 2 | -5/+7 |
| |\| | | | | | |||||
| | * | | | | | bugfix: instabilities when using RFC5424 header fields | Kaiwang Chen | 2012-01-09 | 1 | -5/+5 |
| | * | | | | | bugfix: stats counter were not properly initialized on creation | Rainer Gerhards | 2011-12-20 | 1 | -0/+2 |
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-01-09 | 1 | -0/+5 |
|\| | | | | | | |||||
| * | | | | | | removing $Begin, $End, $StrictScoping directives | Rainer Gerhards | 2012-01-09 | 1 | -0/+5 |
* | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-20 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-20 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | bugfix: stats counter were not properly initialized on creation | Rainer Gerhards | 2011-12-20 | 1 | -0/+2 |
* | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-19 | 3 | -4/+11 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -4/+0 |
| |\| | | | | | |||||
| | * | | | | | better performance for action stats & cleanup: removing debug prints | Rainer Gerhards | 2011-12-19 | 1 | -4/+0 |
| * | | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -3/+7 |
| |\| | | | | | |||||
| | * | | | | | added instrumentation | Rainer Gerhards | 2011-12-19 | 2 | -1/+12 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | experimental: added first stats counter to action object | Rainer Gerhards | 2011-12-16 | 1 | -1/+1 |
| * | | | | | more work on queue statistics counter | Rainer Gerhards | 2011-12-16 | 2 | -5/+10 |
| * | | | | | new stats counter "discarded" for queue object | Rainer Gerhards | 2011-12-16 | 2 | -0/+6 |
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-16 | 2 | -38/+53 |
|\| | | | | | |||||
| * | | | | | enhanced module loader to not rely on PATH_MAX | Rainer Gerhards | 2011-12-16 | 1 | -34/+46 |
| * | | | | | one further change to support gnutls without libgcrypt | Rainer Gerhards | 2011-10-21 | 1 | -0/+2 |
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-12-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-01 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-01 | 1 | -1/+1 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-12-01 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * | | | bugfix: cosmetic: proper constant used instead of number in open call | Tomas Heinrich | 2011-12-01 | 1 | -1/+1 |
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-27 | 2 | -4/+8 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-27 | 1 | -2/+6 |
| |\| | | | | | |||||
| | * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-27 | 1 | -2/+6 |
| | |\| | | | |