Rainer Gerhards df4e90f602 Merge branch 'v5.8.13-prifix' into v5-stable-prifix ...

Conflicts:
	plugins/imklog/imklog.c
	plugins/imklog/ksym.c
	runtime/rule.c

2014-09-16 12:43:29 +02:00

..

im3195

Merge branch 'v4-stable' into v5-stable

2012-01-14 18:32:40 +01:00

imdiag

added configuration directive to disable octet-counted framing

2012-03-19 15:28:25 +01:00

imfile

Merge branch 'v5.8.13-prifix' into v5-stable-prifix

2014-09-16 12:43:29 +02:00

imgssapi

added configuration directive to disable octet-counted framing

2012-03-19 15:28:25 +01:00

imklog

Merge branch 'v5.8.13-prifix' into v5-stable-prifix

2014-09-16 12:43:29 +02:00

immark

Merge branch 'v4-stable' into v5-stable

2012-01-14 18:32:40 +01:00

impstats

milestone: added capability to use a local interface IP address as fromhost-ip

2012-03-21 11:43:45 +01:00

imptcp

Merge branch 'v5-stable-newstats' into v5-beta

2012-04-19 18:04:13 +02:00

imrelp

enable DNS resolution in imrelp

2012-09-26 10:54:42 +02:00

imsolaris

Merge branch 'v5.8.13-prifix' into v5-stable-prifix

2014-09-16 12:43:29 +02:00

imtcp

Merge branch 'v5-stable-newstats' into v5-devel

2012-03-19 18:10:20 +01:00

imtemplate

fix compile problems and cleanup

2014-09-16 11:46:41 +02:00

imudp

fix epoll-enabled code to use correct data member for pointers

2012-10-19 09:07:32 +02:00

imuxsock

Merge branch 'v5.8.13-prifix' into v5-stable-prifix

2014-09-16 12:43:29 +02:00

mmsnmptrapd

Merge branch 'v5-stable-imfile-batches' into v5-devel

2011-06-06 09:17:27 +02:00

omdbalerting

added work-around for bug in gtls, which causes fd leak when using TLS

2011-02-23 11:25:43 +01:00

omelasticsearch

elasticsearch: move to asl 2.0

2012-01-17 10:42:04 +01:00

omgssapi

Merge branch 'v4-stable' into v5-stable

2011-12-16 11:05:16 +01:00

omhdfs

omhdfs: added some info on Java environment settings

2011-03-11 12:10:38 +01:00

omlibdbi

Merge branch 'v4-stable' into v5-stable

2012-01-14 18:32:40 +01:00

ommail

Merge branch 'v4-stable' into v5-stable

2012-01-14 18:32:40 +01:00

ommysql

ommysql: added support for new mysql_library_[init/exit]

2012-05-03 13:48:46 +02:00

omoracle

added work-around for bug in gtls, which causes fd leak when using TLS

2011-02-23 11:25:43 +01:00

ompgsql

Force ANSI SQL treatment of strings for Postgres

2011-03-29 12:00:56 +02:00

omprog

Merge branch 'v4-stable' into v5-stable

2012-01-27 12:50:19 +01:00

omrelp

Merge branch 'v4-stable' into v5-stable

2012-01-14 18:32:40 +01:00

omruleset

added work-around for bug in gtls, which causes fd leak when using TLS

2011-02-23 11:25:43 +01:00

omsnmp

Merge branch 'v4-stable' into v5-stable

2012-01-14 18:32:40 +01:00

omstdout

Merge branch 'v4-stable' into v5-stable

2012-01-14 18:32:40 +01:00

omtemplate

added work-around for bug in gtls, which causes fd leak when using TLS

2011-02-23 11:25:43 +01:00

omtesting

Merge branch 'v4-stable' into v5-stable

2012-01-14 18:32:40 +01:00

omudpspoof

bugfix[kind of]: omudpspoof discarded messages >1472 bytes (MTU size)

2012-12-17 15:10:55 +01:00

omuxsock

Merge branch 'v4-stable' into v5-stable

2012-01-14 18:32:40 +01:00

pmaixforwardedfrom

doc: cleanup of copy-and-paste error in comment

2011-07-13 13:00:08 +02:00

pmcisconames

fixed small regression from gnutls fd leak fix

2011-03-06 15:18:01 +01:00

pmlastmsg

added work-around for bug in gtls, which causes fd leak when using TLS

2011-02-23 11:25:43 +01:00

pmrfc3164sd

added work-around for bug in gtls, which causes fd leak when using TLS

2011-02-23 11:25:43 +01:00

pmsnare

fixed small regression from gnutls fd leak fix

2011-03-06 15:18:01 +01:00

sm_cust_bindcdr

undo accidental removal of a component

2011-05-10 09:24:48 +02:00