summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-0/+9
| | | | The most common files are now changed, more needs to be done.
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-181-1/+5
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
| * preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-171-1/+3
| |
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-161-0/+2
| |\ | | | | | | | | | | | | Conflicts: tools/syslogd.c
| | * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-161-0/+2
| | | | | | | | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | final prep for 6.2.0v6.2.0Rainer Gerhards2012-01-091-1/+1
| | |
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-091-0/+7
|\| |
| * | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-091-0/+2
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+1
| | |
| * | bugfix: imuxsock did truncate part of received message if it did not contain ↵Rainer Gerhards2011-12-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295
* | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-091-1/+4
| | | | | | | | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. -------------------------
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-161-1/+4
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-161-1/+4
| |\|
| | * bugfix: potential fatal abort in omgssapiTomas Heinrich2011-12-161-1/+3
| | |
| | * added doc for omprogRainer Gerhards2011-12-161-0/+1
| | |
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-011-0/+3
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-011-0/+3
| |\| | | | | | | | | | | | | Conflicts: action.c
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-011-0/+3
| | |\
| | | * bugfix: action resume interval incorrectly handled, thus took longer to resumev3-stableTomas Heinrich2011-12-011-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | | * bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-011-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-271-1/+12
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-271-1/+9
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | preparing for 5.8.6 releasev5.8.6Rainer Gerhards2011-10-211-1/+1
| | | |
| * | | bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-211-0/+1
| | | |
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-0/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html
| * | | bugfix: $OMFileFlushInterval period was doubled - now using correct valueRainer Gerhards2011-10-181-0/+1
| | | |
* | | | bugfix (kind of): removed numerical part from pri-textRainer Gerhards2011-10-211-0/+2
| | | | | | | | | | | | | | | | see v6 compatibility document for reasons
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-171-0/+6
|\| | |
| * | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2011-10-171-1/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | doc: mention imported bugfix in ChangeLogRainer Gerhards2011-10-131-0/+2
| | | | |
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-131-0/+2
| | |\| |
| | | * | bugfix: $ActionExecOnlyOnce interval did not work properlyTomas Heinrich2011-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | bugfix: ActionQueue could malfunction due to index errorVlad Grigorescu2011-10-171-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-131-1/+13
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | bugfix: race condition when extracting structured data and PROCIDRainer Gerhards2011-10-131-2/+4
| | | | | | | | | | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME
| * | | | bugfix: race condition when extracting program name and APPNAMERainer Gerhards2011-10-131-1/+3
| |/ / / | | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names
| * | | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas.
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-261-0/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-261-0/+3
| | | | | | | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-09-221-0/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: this merge has problems, to be fixed with follow-up commits If file creation fails due to out of memory, we can enter a tight loop. Conflicts: ChangeLog configure.ac doc/manual.html runtime/parser.c runtime/rsyslog.h tests/Makefile.am tests/tcpflood.c
| | * | bugfix: potential abort if ultra-large file io buffers are used andRainer Gerhards2011-09-201-0/+5
| | | | | | | | | | | | | | | | | | | | dynafile cache exhausts address space (primarily a problem on 32 bit platforms)
| | * | Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0Rainer Gerhards2011-09-071-0/+98
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no changes compared to 4.7.5, just a re-release with the new version number as new v4-stable. The most important new feature is Solaris support. Conflicts: configure.ac doc/manual.html
| | | * | preparing for 4.7.5 releasev4.7.5Rainer Gerhards2011-08-311-1/+1
| | | | |
| | | * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-301-3/+5
| | | |\ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: ChangeLog
| | | * | Added changelog entryAndre Lorbach2011-08-111-0/+1
| | | | |
| | | * | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-111-0/+1
| | | |\ \
| | | * \ \ Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-091-0/+3
| | | |\ \ \
| | | * \ \ \ Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-0/+7
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog