Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Rainer Gerhards | 2012-01-09 | 4 | -43/+2 |
|\ | |||||
| * | removing $Begin, $End, $StrictScoping directives | Rainer Gerhards | 2012-01-09 | 4 | -43/+2 |
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-19 | 1 | -1/+3 |
|\ \ | |||||
| * \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 4 | -4/+49 |
| |\ \ | |||||
| | * | | added instrumentation | Rainer Gerhards | 2011-12-19 | 1 | -1/+3 |
| * | | | more work on queue statistics counter | Rainer Gerhards | 2011-12-16 | 1 | -1/+3 |
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-16 | 1 | -5/+23 |
|\| | | | |||||
| * | | | preparing for 5.9.4v5.9.4 | Rainer Gerhards | 2011-11-29 | 1 | -1/+1 |
| * | | | imuxsock: added capability to "annotate" messages with "trusted information", | Rainer Gerhards | 2011-11-29 | 1 | -5/+23 |
* | | | | Merge branch 'beta' | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
| | |\ \ | |||||
| | | * | | added doc for omprog | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-12-12 | 2 | -4/+5 |
|\| | | | | |||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-01 | 1 | -3/+2 |
| |\| | | | |||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| | |\| | | |||||
| | | * | | doc bugfix: typo in imgssapi doc | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| |\| | | | |||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| | |\| | | |||||
| | | * | | doc: imfile: clarified that empty lines are not processed | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-27 | 3 | -29/+59 |
|\| | | | | |||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 1 | -2/+1 |
| |\ \ \ \ | |||||
| * | | | | | bugfix (kind of): removed numerical part from pri-text | Rainer Gerhards | 2011-10-21 | 2 | -25/+68 |
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-10-21 | 2 | -5/+5 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-21 | 2 | -5/+5 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | preparing for 5.8.6 releasev5.8.6 | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-20 | 2 | -5/+5 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | doc bugfix: pri-text neees to be fixed in an article as well | Rainer Gerhards | 2011-10-20 | 1 | -3/+3 |
| | | * | | doc bug: property pri-text was incorrectly described | Rainer Gerhards | 2011-10-20 | 1 | -2/+2 |
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
| |\| | | | |||||
| * | | | | preparing for 5.9.3 releasev5.9.3 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| * | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-16 | 1 | -2/+2 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'beta' | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | doc: clarified that imklog does not support Solaris | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
| | | * | | | Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0 | Rainer Gerhards | 2011-09-07 | 14 | -22/+348 |
| | | |\ \ \ | |||||
| | | | * | | | preparing for 4.7.5 releasev4.7.5 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | | | * | | | preparing for 4.7.4v4.7.4 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | * | | | issue a warning message for old-style dynafile action | Rainer Gerhards | 2011-07-11 | 1 | -0/+19 |
| | | | * | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-07-11 | 4 | -10/+17 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-09 | 1 | -0/+1 |
| | | | |\ \ \ \ | |||||
| | | * | | | | | | preparing for 4.6.8 releasev4.6.8 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | | | |_|/ / / | | | |/| | | | | |||||
| | * | | | | | | preparing for 5.8.5 releasev5.8.5 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | preparing for 6.1.12 releasev6.1.12 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
* | | | | | | | preparing for 6.3.6 releasev6.3.6 | Rainer Gerhards | 2011-09-19 | 1 | -1/+2 |
* | | | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELP | Rainer Gerhards | 2011-09-08 | 1 | -3/+6 |
* | | | | | | | preparing for 6.3.5 release | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
* | | | | | | | Merge branch 'beta' | Andre Lorbach | 2011-08-18 | 1 | -2/+2 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 1 | -2/+2 |
| |\| | | | | |