summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-12 14:53:17 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-12 14:53:17 +0200
commitc04f196e25d63a7f45bf2ad79b48019fed98e5c9 (patch)
treea464307792f489bc9902ed5bfc6991ca082a25f4
parent920cc1e1640a7a01145111530106cf96a60b6086 (diff)
parent4bc99a5ead6892393033d22d6ce46052aca36155 (diff)
downloadrsyslog-c04f196e25d63a7f45bf2ad79b48019fed98e5c9.tar.gz
rsyslog-c04f196e25d63a7f45bf2ad79b48019fed98e5c9.tar.xz
rsyslog-c04f196e25d63a7f45bf2ad79b48019fed98e5c9.zip
Merge branch 'v2-stable' into v3-stable
Conflicts: ChangeLog syslogd.c
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5491c407..ea1b01d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -651,6 +651,14 @@ Version 3.10.0 (rgerhards), 2008-01-07
- much cleaner code due to new objects and removal of single-threading
mode
---------------------------------------------------------------------------
+Version 2.0.6 V2-STABLE (rgerhards), 2008-??-??
+- bugfix: copy&paste error lead to dangling if - this caused a very minor
+ issue with re-formatting a RFC3164 date when the message was invalidly
+ formatted and had a colon immediately after the date. This was in the
+ code for some years (even v1 had it) and I think it never had any
+ effect at all in practice. Though, it should be fixed - but definitely
+ nothing to worry about.
+---------------------------------------------------------------------------
Version 2.0.6 V2-STABLE (rgerhards), 2008-08-07
- bugfix: IPv6 addresses could not be specified in forwarding actions
New syntax @[addr]:port introduced to enable that. Root problem was IPv6