summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* preparing for 6.3.2v6.3.2Rainer Gerhards2011-07-064-19/+18
* Merge branch 'beta'Rainer Gerhards2011-07-067-11/+64
|\
| * issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-062-2/+11
| * Merge branch 'v5-stable' into betaRainer Gerhards2011-07-067-19/+48
| |\
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-065-11/+23
| | |\
| | | * added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-063-8/+19
| | | * doc: ./configure --help invalidly showed imdiag enabled by defaultRainer Gerhards2011-07-061-1/+1
| | | * preparing for 4.6.6v4.6.6Rainer Gerhards2011-06-243-3/+3
| | * | doc: mentioned Lennart's patch in ChangeLogRainer Gerhards2011-07-021-0/+3
| | * | systemd: direct stdout/stderr of rsyslog to nullLennart Poettering2011-07-021-0/+1
| | * | reduced sporadic failures during make checkRainer Gerhards2011-06-301-9/+14
| * | | prepare for 6.1.10v6.1.10Rainer Gerhards2011-06-223-2/+14
* | | | reduced sporadic failures during make checkRainer Gerhards2011-06-271-9/+14
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-2728-187/+585
|\ \ \ \
| * | | | added support for obtaining timestamp for kernel message from messageRainer Gerhards2011-06-246-99/+130
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-2114-69/+177
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | added support for obtaining timestamp from system for imuxsockRainer Gerhards2011-06-206-47/+132
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-1610-57/+195
| |\ \ \ \
| * \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-148-57/+615
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v4-devel' into v5-develRainer Gerhards2011-06-143-1/+9
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-06-143-4/+12
| | |\ \ \ \ \ \
| * | | | | | | | preparing for 5.9.0v5.9.0Rainer Gerhards2011-06-105-4/+5
| * | | | | | | | $ActionName is now also used for naming of queues in impstats...Rainer Gerhards2011-06-101-0/+2
| * | | | | | | | bugfix: error state not correctly set for gone-away config directiveRainer Gerhards2011-06-101-0/+1
| * | | | | | | | set queue name to aciton name (useful for impstats!)Rainer Gerhards2011-06-071-1/+6
| * | | | | | | | Merge branch 'v5-stable-imfile-batches' into v5-develRainer Gerhards2011-06-068-9/+48
| |\ \ \ \ \ \ \ \
| | * | | | | | | | imfile: added $InputFileMaxLinesAtOnce directiveRainer Gerhards2011-05-244-3/+21
| | * | | | | | | | enhanced imfile to support input batchingRainer Gerhards2011-05-242-1/+14
| * | | | | | | | | Merge branch 'v4-devel' into v5-develRainer Gerhards2011-05-201-5/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-201-5/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-112-2/+16
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc bugfix: yet another typoRainer Gerhards2011-05-132-2/+2
| * | | | | | | | | | | mmsnmptrapd: doc bugfix and fix issue with config stmt handlerRainer Gerhards2011-05-132-4/+7
| * | | | | | | | | | | added support to control KEEPALIVE settings in imptcpRainer Gerhards2011-05-133-2/+83
| * | | | | | | | | | | imptcp: added capability to activate keep-alive at socket layerRainer Gerhards2011-05-113-7/+44
| * | | | | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-1111-1/+599
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v4-devel' into v5-develRainer Gerhards2011-05-092-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-0915-21/+143
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | bugfix: a slightly more informative error message when a TCPRainer Gerhards2011-05-023-5/+11
| | * | | | | | | | | | | | bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-242-3/+4
| * | | | | | | | | | | | | added capability for imtcp to activate keep-alive packetsRainer Gerhards2011-05-096-2/+30
| * | | | | | | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-036-6/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | better handling of queue i/o errors in disk queues.Rainer Gerhards2011-05-034-7/+69
* | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-06-2123-111/+390
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-06-2121-107/+355
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2Rainer Gerhards2011-06-213-5/+16
| | * | | | | | | | | | | | | preparing for 5.8.2Rainer Gerhards2011-06-214-4/+5
| | * | | | | | | | | | | | | testbench: added new tests for failover casesRainer Gerhards2011-06-2010-52/+130
| | * | | | | | | | | | | | | bugfix: problems in failover action handlingRainer Gerhards2011-06-203-10/+14
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-162-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |