summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'beta'masterRainer Gerhards2012-10-192-4/+4
|\
| * Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-4/+4
| |\
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-192-4/+4
| | |\
| | | * fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-192-4/+4
* | | | doc: improve module docFlorian Riedl2012-10-191-26/+42
* | | | prepare for 7.3.1 releaseRainer Gerhards2012-10-193-3/+3
* | | | Merge branch 'beta'Rainer Gerhards2012-10-192-7/+5
|\ \ \ \ | |/ / /
| * | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-2/+3
| * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-5/+1
| |\ \ \ | | |/ /
| | * | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-192-5/+1
* | | | Merge branch 'beta'Rainer Gerhards2012-10-185-63/+9
|\ \ \ \ | |/ / /
| * | | preparing for 7.1.12 releaseRainer Gerhards2012-10-183-3/+5
| * | | build: Remove vestiges of the cust1 pluginMichael Biebl2012-10-181-1/+0
| * | | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
| * | | build: Drop unused CNF_LIBS variableMichael Biebl2012-10-182-3/+2
| * | | build: Use pkg-config to check for libcurlMichael Biebl2012-10-181-19/+1
| * | | build: Use pkg-config to check for libuuidMichael Biebl2012-10-181-16/+1
| * | | build: Don't call AC_SUBST for variables defined by PKG_CHECK_MODULESMichael Biebl2012-10-181-21/+0
| * | | doc: typo fixRainer Gerhards2012-10-171-1/+1
* | | | doc: add recent optimization to ChangeLogRainer Gerhards2012-10-181-0/+2
* | | | Merge branch 'master-newtemplate'Rainer Gerhards2012-10-188-65/+160
|\ \ \ \
| * | | | Fix crash when date properties are used without a templateMiloslav Trma─Ź2012-10-111-2/+11
| * | | | optimize property replacer: reduce runtime for simple processingRainer Gerhards2012-10-113-6/+23
| * | | | fix: wrong variable was populated in MsgGetProp()Rainer Gerhards2012-10-111-8/+8
| * | | | Merge branch 'master' into master-newtemplateRainer Gerhards2012-10-115-7/+11
| |\ \ \ \
| * | | | | slightly improve performance for $NOW family of system propertiesRainer Gerhards2012-10-111-17/+32
| * | | | | do "template date call" only when actually neededRainer Gerhards2012-10-114-1/+56
| * | | | | optimize: do "template time() call" only once per batchRainer Gerhards2012-10-103-23/+20
| * | | | | refactor tpl processor so that date is queried once per templateRainer Gerhards2012-10-105-33/+44
* | | | | | imklog: add paramter "keepkerneltimestamp"Rainer Gerhards2012-10-174-16/+21
* | | | | | doc: update ChangeLog infoRainer Gerhards2012-10-171-1/+5
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-173-6/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | doc: add (v5-imported) imklog bugfix to ChangeLogRainer Gerhards2012-10-171-0/+3
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-173-6/+8
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | doc: reflect recent (v5-imported) fix in ChangeLogRainer Gerhards2012-10-171-1/+1
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-173-5/+7
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | preparing for 5.10.1Rainer Gerhards2012-10-173-4/+4
| | | * | | imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | | * | | imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | | * | | imklog: skip leading spaces in kernel timestampMarius Tomaschewski2012-10-171-1/+3
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-165-53/+41
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-163-38/+17
| |\ \ \ \ \ | | |/ / / /
| | * | | | cleanup: removed remains of -c option (compatibility mode)Rainer Gerhards2012-10-164-39/+14
| * | | | | doc: mention recent patches in ChangeLogRainer Gerhards2012-10-161-3/+7
| * | | | | systemd: Remove obsolete ExecStartPre commandMichael Biebl2012-10-161-1/+0
| * | | | | systemd: Drop obsolete compatibility flagMichael Biebl2012-10-161-1/+1
| * | | | | prepare for version 7.1.11Rainer Gerhards2012-10-163-4/+8
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-162-9/+11
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-162-8/+10
| | |\ \ \ \ | | | |/ / /
| | | * | | bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-162-8/+6