Rainer Gerhards f1d00f3c91 Merge branch 'v8-stable' ...

Conflicts:
	ChangeLog
	grammar/lexer.l

2014-07-14 14:58:27 +02:00

..

external

fix copyright

2014-04-15 15:40:30 +02:00

im3195

im3195: object was not freed on exit [ASL2.0]

2013-01-08 14:42:54 +01:00

imdiag

fix: remove accidently left-in debug output (in previous commit)

2014-07-13 15:36:44 +02:00

imfile

Merge branch 'v7-stable' into v8-stable

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

imgssapi

bugfix: postpone the start of the imgssapi listener

2013-06-03 18:18:45 +02:00

imjournal

imjournal: avoid void* arithmetic

2014-04-30 12:06:12 +02:00

imklog

bugfix: add a missing pointer assignment

2014-07-11 15:19:43 +02:00

imkmsg

make rsyslog use the new json-c pkgconfig file if available

2013-09-03 11:38:01 +02:00

immark

bugfix: immark did emit messages under kern.=info instead of syslog.=info

2013-12-16 09:02:26 +01:00

impstats

Merge branch 'v7-devel'

2013-12-11 13:49:18 +01:00

imptcp

Merge branch 'v7-stable' into v8-stable

2014-07-13 15:31:35 +02:00

imrelp

Merge branch 'v8-stable'

2014-06-08 16:51:24 +02:00

imsolaris

fix another build problem on Solaris

2014-04-09 16:57:26 +02:00

imtcp

Merge branch 'v7-stable'

2013-10-28 11:45:56 +01:00

imttcp

fix internal messages with LF in them

2013-12-18 14:54:33 +01:00

imudp

Merge branch 'v8-stable'

2014-07-13 13:07:19 +02:00

imuxsock

pmciscoiso: support Nexus TZ string in date (but right now ignore it)

2014-07-08 15:51:52 +02:00

imzmq3

bugfix imzmq3: potential segfault on startup

2013-06-06 16:09:46 +02:00

mmanon

mmanon: adjust to recent omod interface changes

2013-11-10 11:09:57 +01:00

mmaudit

mmaudit: now supports v8 output module interface and work again

2013-11-17 18:09:55 +01:00

mmcount

Merge branch 'v7-stable'

2014-02-16 11:01:38 +01:00

mmexternal

bugfix: mmexternal remove framing char before processing JSON reply

2014-05-01 11:39:22 +02:00

mmfields

mmfields: support v8 omod interface

2013-11-13 13:11:04 +01:00

mmjsonparse

Merge branch 'v7-stable' into v8-stable

2014-04-16 10:20:13 +02:00

mmnormalize

remove compiler warning

2013-11-28 11:48:19 +01:00

mmpstrucdata

Merge branch 'v7-devel'

2013-11-22 11:10:54 +01:00

mmrfc5424addhmac

make mmrfc5424addhmac build under v8

2014-05-20 12:13:38 +02:00

mmsequence

Merge branch 'v7-stable'

2014-02-16 11:01:38 +01:00

mmsnmptrapd

Merge branch 'v7-stable' into v8-stable

2014-05-20 10:06:05 +02:00

mmutf8fix

Merge branch 'v7-stable' into v8-stable

2014-04-15 14:33:47 +02:00

omelasticsearch

added HTTPS option to omelasticsearch

2014-02-28 15:22:58 +02:00

omgssapi

make omgssapi build under v8

2014-05-18 11:18:15 +02:00

omhdfs

remove some (currently) unused code

2014-05-21 08:58:33 +02:00

omhiredis

Convert to v8 interface

2013-11-18 10:39:39 +01:00

omjournal

Merge branch 'v7-devel'

2014-01-20 11:57:44 +01:00

omlibdbi

omlibdbi: very minimal support for v8 omod interface

2013-11-13 12:51:12 +01:00

ommail

ommail: small cleanup

2013-11-12 14:16:04 +01:00

ommongodb

Merge branch 'v7-stable'

2014-02-15 16:01:51 +01:00

ommysql

bugfix: ommysql: handle/mem leak upon termination of worker thread

2014-07-05 22:23:01 +02:00

omoracle

milestone: added module config names

2011-07-20 10:47:24 +02:00

ompgsql

fix broken PostgreSQL database creation

2014-06-13 17:20:50 +01:00

omprog

omprog: guard program-to-be-executed against CTL-C

2014-01-27 15:18:59 +01:00

omrabbitmq

make omrabbitmq build under v8

2014-05-19 13:03:05 +02:00

omrelp

Merge branch 'v7-stable' into v8-stable

2014-03-26 18:01:17 +01:00

omruleset

omruleset: make work with v8 omod interface

2013-10-31 18:29:36 +01:00

omsnmp

omsnmp: support omod v8 interface

2013-11-11 15:28:34 +01:00

omstdout

Merge branch 'v7-stable' into v8-stable

2014-05-28 12:13:27 +02:00

omtesting

omtesting: fix for multiple worker threads was incomplete

2013-12-05 16:26:18 +01:00

omudpspoof

omudpspoof: support v8 omod interface

2013-11-13 12:01:48 +01:00

omuxsock

omuxsock: minimal support for v8 omod interface

2013-11-13 12:35:10 +01:00

omzmq3

make omzmq3 build under v8

2014-05-20 11:20:16 +02:00

pmaixforwardedfrom

milestone: added module config names

2011-07-20 10:47:24 +02:00

pmciscoios

pmciscoios: support optional parsing ORIGIN field

2014-07-08 21:14:48 +02:00

pmcisconames

milestone: added module config names

2011-07-20 10:47:24 +02:00

pmlastmsg

consistently use new message protocol type #define's

2013-09-23 12:17:53 +02:00

pmrfc3164sd

pmciscoiso: support Nexus TZ string in date (but right now ignore it)

2014-07-08 15:51:52 +02:00

pmsnare

milestone: added module config names

2011-07-20 10:47:24 +02:00

sm_cust_bindcdr

Merge branch 'v6-stable-noscoping' into master

2012-01-19 13:07:46 +01:00