Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-10-18 | 8 | -65/+160 |
|\ | |||||
| * | Fix crash when date properties are used without a template | Miloslav Trmač | 2012-10-11 | 1 | -2/+11 |
| * | optimize property replacer: reduce runtime for simple processing | Rainer Gerhards | 2012-10-11 | 3 | -6/+23 |
| * | fix: wrong variable was populated in MsgGetProp() | Rainer Gerhards | 2012-10-11 | 1 | -8/+8 |
| * | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-10-11 | 5 | -7/+11 |
| |\ | |||||
| * | | slightly improve performance for $NOW family of system properties | Rainer Gerhards | 2012-10-11 | 1 | -17/+32 |
| * | | do "template date call" only when actually needed | Rainer Gerhards | 2012-10-11 | 4 | -1/+56 |
| * | | optimize: do "template time() call" only once per batch | Rainer Gerhards | 2012-10-10 | 3 | -23/+20 |
| * | | refactor tpl processor so that date is queried once per template | Rainer Gerhards | 2012-10-10 | 5 | -33/+44 |
* | | | imklog: add paramter "keepkerneltimestamp" | Rainer Gerhards | 2012-10-17 | 4 | -16/+21 |
* | | | doc: update ChangeLog info | Rainer Gerhards | 2012-10-17 | 1 | -1/+5 |
* | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-17 | 3 | -6/+11 |
|\ \ \ | |||||
| * | | | doc: add (v5-imported) imklog bugfix to ChangeLog | Rainer Gerhards | 2012-10-17 | 1 | -0/+3 |
| * | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-17 | 3 | -6/+8 |
| |\ \ \ | |||||
| | * | | | doc: reflect recent (v5-imported) fix in ChangeLog | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-17 | 3 | -5/+7 |
| | |\ \ \ | |||||
| | | * | | | preparing for 5.10.1v5.10.1 | Rainer Gerhards | 2012-10-17 | 3 | -4/+4 |
| | | * | | | imklog: use memmove instead of memcpy (solaris) | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | * | | | imklog: use memmove to remove kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | * | | | imklog: skip leading spaces in kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+3 |
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-16 | 5 | -53/+41 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 3 | -38/+17 |
| |\| | | | | |||||
| | * | | | | cleanup: removed remains of -c option (compatibility mode) | Rainer Gerhards | 2012-10-16 | 4 | -39/+14 |
| * | | | | | doc: mention recent patches in ChangeLog | Rainer Gerhards | 2012-10-16 | 1 | -3/+7 |
| * | | | | | systemd: Remove obsolete ExecStartPre command | Michael Biebl | 2012-10-16 | 1 | -1/+0 |
| * | | | | | systemd: Drop obsolete compatibility flag | Michael Biebl | 2012-10-16 | 1 | -1/+1 |
| * | | | | | prepare for version 7.1.11v7.1.11 | Rainer Gerhards | 2012-10-16 | 3 | -4/+8 |
| * | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 2 | -9/+11 |
| |\| | | | | |||||
| | * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-16 | 2 | -8/+10 |
| | |\| | | | |||||
| | | * | | | bugfix: imuxsock truncated head of received message | Rainer Gerhards | 2012-10-16 | 2 | -8/+6 |
| | | * | | | fix problem with cutting first 16 characters from message with bAnnotate on m... | Milan Bartos | 2012-10-10 | 1 | -1/+5 |
| | * | | | | doc: fix minor small but important typo in ChangeLog | Rainer Gerhards | 2012-10-16 | 1 | -1/+1 |
* | | | | | | doc: update ChangeLog with CEE cookie change | Rainer Gerhards | 2012-10-11 | 1 | -0/+8 |
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 3 | -3/+26 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-11 | 1 | -0/+12 |
| |\| | | | | |||||
| | * | | | | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 |
| * | | | | | Don't require the trailing space in @cee: cookie | Miloslav Trmač | 2012-10-11 | 1 | -1/+1 |
| * | | | | | doc: add last patch to ChangeLog | Rainer Gerhards | 2012-10-11 | 1 | -0/+2 |
| * | | | | | Fix crash when date properties are used without a template | Miloslav Trmač | 2012-10-11 | 1 | -2/+11 |
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 9 | -8/+49 |
|\| | | | | | |_|_|_|/ |/| | | | | |||||
| * | | | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 3 | -1/+25 |
| * | | | | added deprecated note to omruleset | Rainer Gerhards | 2012-10-11 | 3 | -0/+10 |
| * | | | | make omruleset non-default in ./configure | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| * | | | | preparing for 7.1.10 releasev7.1.10 | Rainer Gerhards | 2012-10-11 | 2 | -2/+2 |
| * | | | | fix regression introduced by last commit | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| * | | | | bugfixes in regards to action() | Rainer Gerhards | 2012-10-11 | 2 | -0/+4 |
| * | | | | bugfix: some config processing warning messages were treated as errors | Rainer Gerhards | 2012-10-11 | 2 | -2/+7 |
| * | | | | cosmetic: simplify | Rainer Gerhards | 2012-10-11 | 1 | -3/+1 |
| * | | | | fix double-free | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
|\| | | | |