summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Expand)AuthorAgeFilesLines
* preparing for 6.3.3v6.3.3Rainer Gerhards2011-07-131-2/+3
* proudly added new conf parser to ChangeLog ;-)Rainer Gerhards2011-07-121-0/+4
* Merge branch 'master-newconf'Rainer Gerhards2011-07-121-3/+8
|\
| * removed compatibility mode as we expect people have adjusted their confs by nowRainer Gerhards2011-07-121-0/+4
* | Merge branch 'v5-devel'Rainer Gerhards2011-07-111-3/+13
|\ \
| * | preparing for 5.9.2v5.9.2Rainer Gerhards2011-07-111-1/+1
| * | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-111-2/+9
| |\ \
| | * | preparing for 5.8.3v5.8.3Rainer Gerhards2011-07-111-1/+4
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-1/+3
| | |\ \
| | | * | preparing for 4.6.7 releasev4.6.7Rainer Gerhards2011-07-111-1/+2
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-061-1/+11
| |\| | |
| * | | | preparing for 5.9.1 releasev5.9.1Rainer Gerhards2011-06-301-1/+1
* | | | | preparing for 6.3.2v6.3.2Rainer Gerhards2011-07-061-1/+1
* | | | | Merge branch 'beta'Rainer Gerhards2011-07-061-1/+28
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-061-1/+12
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-061-1/+5
| | |\ \ \ | | | | |/ | | | |/|
| | | * | added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-061-0/+3
| | | * | preparing for 4.6.6v4.6.6Rainer Gerhards2011-06-241-1/+1
| | * | | doc: mentioned Lennart's patch in ChangeLogRainer Gerhards2011-07-021-0/+3
| * | | | prepare for 6.1.10v6.1.10Rainer Gerhards2011-06-221-0/+12
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-271-14/+68
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | added support for obtaining timestamp for kernel message from messageRainer Gerhards2011-06-241-0/+5
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-211-2/+24
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | added support for obtaining timestamp from system for imuxsockRainer Gerhards2011-06-201-0/+9
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-161-0/+14
| |\ \ \ \
| * \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-141-0/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v4-devel' into v5-develRainer Gerhards2011-06-141-0/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-06-141-0/+3
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-111-0/+10
| | |\ \ \ \ \ \ \
| * | | | | | | | | preparing for 5.9.0v5.9.0Rainer Gerhards2011-06-101-1/+1
| * | | | | | | | | $ActionName is now also used for naming of queues in impstats...Rainer Gerhards2011-06-101-0/+2
| * | | | | | | | | Merge branch 'v5-stable-imfile-batches' into v5-develRainer Gerhards2011-06-061-1/+13
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | imfile: added $InputFileMaxLinesAtOnce directiveRainer Gerhards2011-05-241-0/+1
| | * | | | | | | | | enhanced imfile to support input batchingRainer Gerhards2011-05-241-0/+1
| * | | | | | | | | | added support to control KEEPALIVE settings in imptcpRainer Gerhards2011-05-131-0/+2
| * | | | | | | | | | imptcp: added capability to activate keep-alive at socket layerRainer Gerhards2011-05-111-2/+3
| * | | | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-111-0/+20
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'v4-devel' into v5-develRainer Gerhards2011-05-091-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-091-0/+37
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | bugfix: a slightly more informative error message when a TCPRainer Gerhards2011-05-021-0/+2
| | * | | | | | | | | | | bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-241-0/+1
| | * | | | | | | | | | | imudp: removing new scheduling priority setting codeRainer Gerhards2011-01-101-1/+0
| * | | | | | | | | | | | added capability for imtcp to activate keep-alive packetsRainer Gerhards2011-05-091-0/+3
| * | | | | | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-031-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | better handling of queue i/o errors in disk queues.Rainer Gerhards2011-05-031-0/+5
* | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-06-211-1/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-06-211-1/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2Rainer Gerhards2011-06-211-0/+7
| | * | | | | | | | | | | | preparing for 5.8.2Rainer Gerhards2011-06-211-1/+1
| | * | | | | | | | | | | | bugfix: problems in failover action handlingRainer Gerhards2011-06-201-1/+2
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |